Project

General

Profile

« Previous | Next » 

Revision 94f696f9

Added by Katja Luther about 8 years ago

changes for fauna europaea import (misapplied names, improved taxonnode agent relationship)

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionImport.java
24 24

  
25 25
import eu.etaxonomy.cdm.io.common.Source;
26 26
import eu.etaxonomy.cdm.model.common.CdmBase;
27
import eu.etaxonomy.cdm.model.common.TermType;
28
import eu.etaxonomy.cdm.model.common.TermVocabulary;
27 29
import eu.etaxonomy.cdm.model.description.Distribution;
28 30
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
29 31
import eu.etaxonomy.cdm.model.description.TaxonDescription;
......
99 101
		//commitTransaction(txStatus);
100 102

  
101 103
	//	FaunaEuropaeaTransformer.setUUIDs(noDataUuid);
104
		logger.info("create termvoc");
105
		createTermVocabulary(txStatus, state);
102 106

  
103 107
		FaunaEuropaeaImportConfigurator fauEuConfig = state.getConfig();
104 108
		Source source = fauEuConfig.getSource();
......
233 237
		return;
234 238
	}
235 239

  
236
	private void commitTaxaAndDistribution(
240
	/**
241
     *
242
     */
243
    private void createTermVocabulary(TransactionStatus txStatus, FaunaEuropaeaImportState state) {
244
        TermVocabulary<NamedArea> faunaEuAreaVocabulary = TermVocabulary.NewInstance(TermType.NamedArea, "Areas for Fauna Europaea distribution data", "FE areas", "FE", null);
245

  
246
       NamedArea area;
247

  
248
       area =NamedArea.NewInstance(null, "Andorra", "AD");
249
       area.setUuid(UUID.randomUUID());
250
       area.setIdInVocabulary("AD");
251
       state.putNamedArea(area);
252
       faunaEuAreaVocabulary.addTerm(area);
253
       area = NamedArea.NewInstance(null, "Albania", "AL");
254
       area.setIdInVocabulary("AL");
255
       area.setUuid(UUID.randomUUID());
256
       state.putNamedArea(area);
257
       faunaEuAreaVocabulary.addTerm(area);
258
       area = NamedArea.NewInstance(null, "Austria", "AT");
259
       area.setIdInVocabulary("AT");
260
       area.setUuid(UUID.randomUUID());
261
       state.putNamedArea(area);
262
       faunaEuAreaVocabulary.addTerm(area);
263
       area = NamedArea.NewInstance(null, "Bosnia and Herzegovina", "BA");
264
       area.setUuid(UUID.randomUUID());
265
       area.setIdInVocabulary("BA");
266
       state.putNamedArea(area);
267
       faunaEuAreaVocabulary.addTerm(area);
268
       area = NamedArea.NewInstance(null, "Belgium", "BE");
269
       area.setUuid(UUID.randomUUID());
270
       area.setIdInVocabulary("BE");
271
       state.putNamedArea(area);
272
       faunaEuAreaVocabulary.addTerm(area);
273
       area = NamedArea.NewInstance(null, "Bulgaria", "BG");
274
       area.setUuid(UUID.randomUUID());
275
       area.setIdInVocabulary("BG");
276
       state.putNamedArea(area);
277
       faunaEuAreaVocabulary.addTerm(area);
278
       area = NamedArea.NewInstance(null, "Belarus", "BY");
279
       area.setUuid(UUID.randomUUID());
280
       area.setIdInVocabulary("BY");
281
       state.putNamedArea(area);
282
       faunaEuAreaVocabulary.addTerm(area);
283
       area = NamedArea.NewInstance(null, "Switzerland", "CH");
284
       area.setUuid(UUID.randomUUID());
285
       area.setIdInVocabulary("CH");
286
       state.putNamedArea(area);
287
       faunaEuAreaVocabulary.addTerm(area);
288
       area = NamedArea.NewInstance(null, "Cyprus", "CY");
289
       area.setUuid(UUID.randomUUID());
290
       area.setIdInVocabulary("CY");
291
       state.putNamedArea(area);
292
       faunaEuAreaVocabulary.addTerm(area);
293
       area = NamedArea.NewInstance(null, "Czech Republic", "CZ");
294
       area.setUuid(UUID.randomUUID());
295
       area.setIdInVocabulary("CZ");
296
       state.putNamedArea(area);
297
       faunaEuAreaVocabulary.addTerm(area);
298
       area = NamedArea.NewInstance(null, "Germany", "DE");
299
       area.setUuid(UUID.randomUUID());
300
       area.setIdInVocabulary("DE");
301
       state.putNamedArea(area);
302
       faunaEuAreaVocabulary.addTerm(area);
303
       area = NamedArea.NewInstance("Incl. Bornholm I.", "Danish mainland", "DK-DEN");
304
       area.setUuid(UUID.randomUUID());
305
       area.setIdInVocabulary("DK-DEN");
306
       state.putNamedArea(area);
307
       faunaEuAreaVocabulary.addTerm(area);
308
       area = NamedArea.NewInstance(null, "Faroe Is.", "DK-FOR");
309
       area.setUuid(UUID.randomUUID());
310
       area.setIdInVocabulary("DK-FOR");
311
       state.putNamedArea(area);
312
       faunaEuAreaVocabulary.addTerm(area);
313
       area = NamedArea.NewInstance(null, "Estonia", "EE");
314
       area.setUuid(UUID.randomUUID());
315
       area.setIdInVocabulary("EE");
316
       state.putNamedArea(area);
317
       faunaEuAreaVocabulary.addTerm(area);
318
       area = NamedArea.NewInstance("Incl. Mallorca I., Menorca I., and Pityuses Is.(=Ibiza I. + Formentera I.)", "Balearic Is.", "ES-BAL");
319
       area.setUuid(UUID.randomUUID());
320
       area.setIdInVocabulary("ES-BAL");
321
       state.putNamedArea(area);
322
       faunaEuAreaVocabulary.addTerm(area);
323
       area = NamedArea.NewInstance(null, "Canary Is.", "ES-CNY");
324
       area.setUuid(UUID.randomUUID());
325
       area.setIdInVocabulary("ES-CNY");
326
       state.putNamedArea(area);
327
       faunaEuAreaVocabulary.addTerm(area);
328
       area = NamedArea.NewInstance("Incl. Alboran I.", "Spanish mainland", "ES-SPA");
329
       area.setUuid(UUID.randomUUID());
330
       area.setIdInVocabulary("ES-SPA");
331
       state.putNamedArea(area);
332
       faunaEuAreaVocabulary.addTerm(area);
333
       area = NamedArea.NewInstance(null, "Finland", "FI");
334
       area.setUuid(UUID.randomUUID());
335
       area.setIdInVocabulary("FI");
336
       state.putNamedArea(area);
337
       faunaEuAreaVocabulary.addTerm(area);
338
       area = NamedArea.NewInstance(null, "Corsica", "FR-COR");
339
       area.setUuid(UUID.randomUUID());
340
       area.setIdInVocabulary("FR-COR");
341
       state.putNamedArea(area);
342
       faunaEuAreaVocabulary.addTerm(area);
343
       area = NamedArea.NewInstance(null, "French mainland", "FR-FRA");
344
       area.setUuid(UUID.randomUUID());
345
       area.setIdInVocabulary("FR-FRA");
346
       state.putNamedArea(area);
347
       faunaEuAreaVocabulary.addTerm(area);
348
       area = NamedArea.NewInstance("Incl. Jersey, Guernsey, Alderney", "Channel Is.", "GB-CI");
349
       area.setUuid(UUID.randomUUID());
350
       area.setIdInVocabulary("GB-CI");
351
       state.putNamedArea(area);
352
       faunaEuAreaVocabulary.addTerm(area);
353
       area = NamedArea.NewInstance(null, "Gibraltar", "GB-GI");
354
       area.setUuid(UUID.randomUUID());
355
       area.setIdInVocabulary("GB-GI");
356
       state.putNamedArea(area);
357
       faunaEuAreaVocabulary.addTerm(area);
358
       area = NamedArea.NewInstance("Incl. Shetlands, Orkneys, Hebrides and Man Is.", "Britain I.", "GB-GRB");
359
       area.setUuid(UUID.randomUUID());
360
       area.setIdInVocabulary("GB-GRB");
361
       state.putNamedArea(area);
362
       faunaEuAreaVocabulary.addTerm(area);
363
       area = NamedArea.NewInstance(null, "Northern Ireland", "GB-NI");
364
       area.setUuid(UUID.randomUUID());
365
       area.setIdInVocabulary("GB-NI");
366
       state.putNamedArea(area);
367
       faunaEuAreaVocabulary.addTerm(area);
368
       area = NamedArea.NewInstance("Incl. And?psara, ?yios Evstr?tios, Fo?rnoi, Ikar?a, Kh?os, "
369
               + "L?svos, L?mnos, Oino?sa, Psar?, S?mos, Sk?pelos Kaloyeroi and other smaller islands",
370
               "V?reion Aiy?ion (North Aegean Is.)", "GR-AEG");
371
       area.setUuid(UUID.randomUUID());
372
       area.setIdInVocabulary("GR-AEG");
373
       state.putNamedArea(area);
374
       faunaEuAreaVocabulary.addTerm(area);
375
       area = NamedArea.NewInstance("Incl. Amorg?s, An?fi, ?nidros, ?ndros, And?paros, Deno?sa, Fol?gandros, ?os, Ir?klia, "
376
               + "K?ros, K?molos, K?a, K?thnos, M?los, M?konos, N?xos, P?ros, Pol?aigos, S?rifos, S?fnos, S?kinos, "
377
               + "S?ros, Th?ra, T?nos, Yiar?s and other smaller islands", "Kikl?des (Cyclades Is.)", "GR-CYC");
378
       area.setUuid(UUID.randomUUID());
379
       area.setIdInVocabulary("GR-CYC");
380
       state.putNamedArea(area);
381
       faunaEuAreaVocabulary.addTerm(area);
382
       area = NamedArea.NewInstance("Incl. Alimni?, ?rkoi, Astip?laia, Avgon?si, Ankathon?si, Farmakon?si, Ioinian?sia, "
383
               + "K?limnos, Kalol?mnos, Kandelio?sa, K?rpathos, K?sos, Kh?lki, Khamil?, K?naros, Kos, L?ros, Lev?tha, "
384
               + "Lips?i, Mey?sti, N?siros, Ofido?sa, P?tmos,", "Dodek?nisos (Dodecanese Is.), R?dhos, Sar?a, S?mi, S?rina, T?los, Tr?a Nisi?, "
385
               + "Yial? and other smaller islands ", "GR-DOD");
386
       area.setUuid(UUID.randomUUID());
387
       area.setIdInVocabulary("GR-DOD");
388
       state.putNamedArea(area);
389
       faunaEuAreaVocabulary.addTerm(area);
390
       area = NamedArea.NewInstance(" Incl. Andik?thira I., Evvia I., Ionian Is., Samothr?ki I., Northern Sporades Is., "
391
               + "Th?sos I.", "Greek mainland", "GR-GRC");
392
       area.setUuid(UUID.randomUUID());
393
       area.setIdInVocabulary("GR-GRC");
394
       state.putNamedArea(area);
395
       faunaEuAreaVocabulary.addTerm(area);
396
       area = NamedArea.NewInstance("Incl. small adjacent islands like G?vdhos. Note that Andik?thira I. although being closer to Kriti "
397
               + "than to mainland, belongs to a mainland province", "Kriti (Crete)", "GR-KRI");
398
       area.setUuid(UUID.randomUUID());
399
       area.setIdInVocabulary("GR-KRI");
400
       state.putNamedArea(area);
401
       faunaEuAreaVocabulary.addTerm(area);
402
       area = NamedArea.NewInstance(null, "Croatia", "HR");
403
       area.setUuid(UUID.randomUUID());
404
       area.setIdInVocabulary("HR");
405
       state.putNamedArea(area);
406
       faunaEuAreaVocabulary.addTerm(area);
407
       area = NamedArea.NewInstance(null, "Hungary", "HU");
408
       area.setUuid(UUID.randomUUID());
409
       area.setIdInVocabulary("HU");
410
       state.putNamedArea(area);
411
       faunaEuAreaVocabulary.addTerm(area);
412
       area = NamedArea.NewInstance(null, "Ireland", "IE");
413
       area.setUuid(UUID.randomUUID());
414
       area.setIdInVocabulary("IE");
415
       state.putNamedArea(area);
416
       faunaEuAreaVocabulary.addTerm(area);
417
       area = NamedArea.NewInstance(null, "Iceland", "IS");
418
       area.setUuid(UUID.randomUUID());
419
       area.setIdInVocabulary("IS");
420
       state.putNamedArea(area);
421
       faunaEuAreaVocabulary.addTerm(area);
422
       area = NamedArea.NewInstance(null, "Italian mainland", "IT-ITA");
423
       area.setUuid(UUID.randomUUID());
424
       area.setIdInVocabulary("IT-ITA");
425
       state.putNamedArea(area);
426
       faunaEuAreaVocabulary.addTerm(area);
427
       area = NamedArea.NewInstance(null, "Sardinia", "IT-SAR");
428
       area.setUuid(UUID.randomUUID());
429
       area.setIdInVocabulary("IT-SAR");
430
       state.putNamedArea(area);
431
       faunaEuAreaVocabulary.addTerm(area);
432
       area = NamedArea.NewInstance(" Incl. adjacent Italian islands (Lipari Is., Ustica I., Egadi Is., "
433
               + "Pantelleria I., Pelagie Is.) ", "Sicily", "IT-SI");
434
       area.setUuid(UUID.randomUUID());
435
       area.setIdInVocabulary("IT-SI");
436
       state.putNamedArea(area);
437
       faunaEuAreaVocabulary.addTerm(area);
438
       area = NamedArea.NewInstance(null, "Liechtenstein", "LI");
439
       area.setUuid(UUID.randomUUID());
440
       area.setIdInVocabulary("LI");
441
       state.putNamedArea(area);
442
       faunaEuAreaVocabulary.addTerm(area);
443
       area = NamedArea.NewInstance(null, "Lithuania", "LT");
444
       area.setUuid(UUID.randomUUID());
445
       area.setIdInVocabulary("LT");
446
       state.putNamedArea(area);
447
       faunaEuAreaVocabulary.addTerm(area);
448
       area = NamedArea.NewInstance(null, "Luxembourg", "LU");
449
       area.setUuid(UUID.randomUUID());
450
       area.setIdInVocabulary("LU");
451
       state.putNamedArea(area);
452
       faunaEuAreaVocabulary.addTerm(area);
453
       area = NamedArea.NewInstance(null, "Latvia", "LV");
454
       area.setUuid(UUID.randomUUID());
455
       area.setIdInVocabulary("LV");
456
       state.putNamedArea(area);
457
       faunaEuAreaVocabulary.addTerm(area);
458
       area = NamedArea.NewInstance(null, "Monaco", "MC");
459
       area.setUuid(UUID.randomUUID());
460
       area.setIdInVocabulary("MC");
461
       state.putNamedArea(area);
462
       faunaEuAreaVocabulary.addTerm(area);
463
       area = NamedArea.NewInstance(null, "Moldova, Republic of", "MD");
464
       area.setUuid(UUID.randomUUID());
465
       area.setIdInVocabulary("MD");
466
       state.putNamedArea(area);
467
       faunaEuAreaVocabulary.addTerm(area);
468
       area = NamedArea.NewInstance(null, "Macedonia, the former Yugoslav Republic of", "MK");
469
       area.setUuid(UUID.randomUUID());
470
       area.setIdInVocabulary("MK");
471
       state.putNamedArea(area);
472
       faunaEuAreaVocabulary.addTerm(area);
473
       area = NamedArea.NewInstance(null, "Malta", "MT");
474
       area.setUuid(UUID.randomUUID());
475
       area.setIdInVocabulary("MT");
476
       state.putNamedArea(area);
477
       faunaEuAreaVocabulary.addTerm(area);
478
       area = NamedArea.NewInstance(null, "The Netherlands", "NL");
479
       area.setUuid(UUID.randomUUID());
480
       area.setIdInVocabulary("NL");
481
       state.putNamedArea(area);
482
       faunaEuAreaVocabulary.addTerm(area);
483
       area = NamedArea.NewInstance(null, "Norwegian mainland", "NO-NOR");
484
       area.setUuid(UUID.randomUUID());
485
       area.setIdInVocabulary("NO-NOR");
486
       state.putNamedArea(area);
487
       faunaEuAreaVocabulary.addTerm(area);
488
       area = NamedArea.NewInstance("Incl. Bear I.", "Svalbard & Jan Mayen", "NO-SVA");
489
       area.setUuid(UUID.randomUUID());
490
       area.setIdInVocabulary("NO-SVA");
491
       state.putNamedArea(area);
492
       faunaEuAreaVocabulary.addTerm(area);
493
       area = NamedArea.NewInstance(null, "Poland", "PL");
494
       area.setUuid(UUID.randomUUID());
495
       area.setIdInVocabulary("PL");
496
       state.putNamedArea(area);
497
       faunaEuAreaVocabulary.addTerm(area);
498
       area = NamedArea.NewInstance(null, "Azores Is.", "PT-AZO");
499
       area.setUuid(UUID.randomUUID());
500
       area.setIdInVocabulary("PT-AZO");
501
       state.putNamedArea(area);
502
       faunaEuAreaVocabulary.addTerm(area);
503
       area = NamedArea.NewInstance(null, "Madeira Is.", "PT-MDR");
504
       area.setUuid(UUID.randomUUID());
505
       area.setIdInVocabulary("PT-MDR");
506
       state.putNamedArea(area);
507
       faunaEuAreaVocabulary.addTerm(area);
508
       area = NamedArea.NewInstance(null, "Portuguese mainland", "PT-POR");
509
       area.setUuid(UUID.randomUUID());
510
       area.setIdInVocabulary("PT-POR");
511
       state.putNamedArea(area);
512
       faunaEuAreaVocabulary.addTerm(area);
513
       area = NamedArea.NewInstance(null, "Selvagens Is.", "PT-SEL");
514
       area.setUuid(UUID.randomUUID());
515
       area.setIdInVocabulary("PT-SEL");
516
       state.putNamedArea(area);
517
       faunaEuAreaVocabulary.addTerm(area);
518
       area = NamedArea.NewInstance(null, "Romania", "RO");
519
       area.setUuid(UUID.randomUUID());
520
       area.setIdInVocabulary("RO");
521
       state.putNamedArea(area);
522
       faunaEuAreaVocabulary.addTerm(area);
523
       area = NamedArea.NewInstance("Excl. Ushakova I. and Vize I.", "Franz Josef Land", "RU-FJL");
524
       area.setUuid(UUID.randomUUID());
525
       area.setIdInVocabulary("RU-FJL");
526
       state.putNamedArea(area);
527
       faunaEuAreaVocabulary.addTerm(area);
528
       area = NamedArea.NewInstance(null, "Kaliningrad Region", "RU-KGD");
529
       area.setUuid(UUID.randomUUID());
530
       area.setIdInVocabulary("RU-KGD");
531
       state.putNamedArea(area);
532
       faunaEuAreaVocabulary.addTerm(area);
533
       area = NamedArea.NewInstance(null, "Novaya Zemlya", "RU-NOZ");
534
       area.setUuid(UUID.randomUUID());
535
       area.setIdInVocabulary("RU-NOZ");
536
       state.putNamedArea(area);
537
       faunaEuAreaVocabulary.addTerm(area);
538
       area = NamedArea.NewInstance(null, "Central European Russia", "RU-RUC");
539
       area.setUuid(UUID.randomUUID());
540
       area.setIdInVocabulary("RU-RUC");
541
       state.putNamedArea(area);
542
       faunaEuAreaVocabulary.addTerm(area);
543
       area = NamedArea.NewInstance(null, "East European Russia", "RU-RUE");
544
       area.setUuid(UUID.randomUUID());
545
       area.setIdInVocabulary("RU-RUE");
546
       state.putNamedArea(area);
547

  
548
       faunaEuAreaVocabulary.addTerm(area);
549
       area = NamedArea.NewInstance(null, "North European Russia", "RU-RUN");
550
       area.setUuid(UUID.randomUUID());
551
       area.setIdInVocabulary("RU-RUN");
552
       state.putNamedArea(area);
553
       faunaEuAreaVocabulary.addTerm(area);
554
       area = NamedArea.NewInstance(null, "South European Russia", "RU-RUS");
555
       area.setUuid(UUID.randomUUID());
556
       area.setIdInVocabulary("RU-RUS");
557
       state.putNamedArea(area);
558
       faunaEuAreaVocabulary.addTerm(area);
559
       area = NamedArea.NewInstance(null, "Northwest European Russia", "RU-RUW");
560
       area.setUuid(UUID.randomUUID());
561
       area.setIdInVocabulary("RU-RUW");
562
       state.putNamedArea(area);
563
       faunaEuAreaVocabulary.addTerm(area);
564
       area = NamedArea.NewInstance("Incl. Gotland I.", "Sweden", "SE");
565
       area.setUuid(UUID.randomUUID());
566
       area.setIdInVocabulary("SE");
567
       state.putNamedArea(area);
568
       faunaEuAreaVocabulary.addTerm(area);
569
       area = NamedArea.NewInstance(null, "Slovenia", "SI");
570
       area.setUuid(UUID.randomUUID());
571
       area.setIdInVocabulary("SI");
572
       state.putNamedArea(area);
573
       faunaEuAreaVocabulary.addTerm(area);
574
       area = NamedArea.NewInstance(null, "Slovakia", "SK");
575
       area.setUuid(UUID.randomUUID());
576
       area.setIdInVocabulary("SK");
577
       state.putNamedArea(area);
578
       faunaEuAreaVocabulary.addTerm(area);
579
       area = NamedArea.NewInstance(null, "San Marino", "SM");
580
       area.setUuid(UUID.randomUUID());
581
       area.setIdInVocabulary("SM");
582
       state.putNamedArea(area);
583
       faunaEuAreaVocabulary.addTerm(area);
584
       area = NamedArea.NewInstance("Incl. Imroz I. -  G?k?eada, but not those in the Sea of Marmara ",
585
               "European Turkey", "TR-TUE");
586
       area.setUuid(UUID.randomUUID());
587
       area.setIdInVocabulary("TR-TUE");
588
       state.putNamedArea(area);
589
       faunaEuAreaVocabulary.addTerm(area);
590
       area = NamedArea.NewInstance(null, "Ukraine", "UA");
591
       area.setUuid(UUID.randomUUID());
592
       area.setIdInVocabulary("UA");
593
       state.putNamedArea(area);
594
       faunaEuAreaVocabulary.addTerm(area);
595
       area = NamedArea.NewInstance(null, "Vatican City", "VA");
596
       area.setUuid(UUID.randomUUID());
597
       area.setIdInVocabulary("VA");
598
       state.putNamedArea(area);
599
       faunaEuAreaVocabulary.addTerm(area);
600
       area = NamedArea.NewInstance("Incl. Serbia, Kosovo, Voivodina, Montenegro", "Yugoslavia", "YU");
601
       area.setUuid(UUID.randomUUID());
602
       area.setIdInVocabulary("YU");
603
       state.putNamedArea(area);
604
       faunaEuAreaVocabulary.addTerm(area);
605
       area = NamedArea.NewInstance(null, "Afro-tropical region", "AFR");
606
       area.setUuid(UUID.randomUUID());
607
       area.setIdInVocabulary("AFR");
608
       state.putNamedArea(area);
609
       faunaEuAreaVocabulary.addTerm(area);
610
       area = NamedArea.NewInstance(null, "Australian region", "AUS");
611
       area.setUuid(UUID.randomUUID());
612
       area.setIdInVocabulary("AUS");
613
       state.putNamedArea(area);
614
       faunaEuAreaVocabulary.addTerm(area);
615
       area = NamedArea.NewInstance("East of the border line here defined", "East Palaearctic", "EPA");
616
       area.setUuid(UUID.randomUUID());
617
       area.setIdInVocabulary("EPA");
618
       state.putNamedArea(area);
619
       faunaEuAreaVocabulary.addTerm(area);
620
       area = NamedArea.NewInstance("Not including Sinai Peninsula", "North Africa", "NAF");
621
       area.setUuid(UUID.randomUUID());
622
       area.setIdInVocabulary("NAF");
623
       state.putNamedArea(area);
624
       faunaEuAreaVocabulary.addTerm(area);
625
       area = NamedArea.NewInstance(null, "Nearctic region", "NEA");
626
       area.setUuid(UUID.randomUUID());
627
       area.setIdInVocabulary("NEA");
628
       state.putNamedArea(area);
629
       faunaEuAreaVocabulary.addTerm(area);
630
       area = NamedArea.NewInstance(null, "Neotropical region", "NEO");
631
       area.setUuid(UUID.randomUUID());
632
       area.setIdInVocabulary("NEO");
633
       state.putNamedArea(area);
634
       faunaEuAreaVocabulary.addTerm(area);
635
       area = NamedArea.NewInstance("Asian Turkey, Caucasian Russian republics, Georgia, Armenia, Azerbaijan, "
636
               + "Lebanon, Syria, Israel, Jordan, Sinai Peninsula (Egypt), Arabian peninsula, Iran, Iraq",
637
               "Near East", "NRE");
638
       area.setUuid(UUID.randomUUID());
639
       area.setIdInVocabulary("NRE");
640
       state.putNamedArea(area);
641
       faunaEuAreaVocabulary.addTerm(area);
642
       area = NamedArea.NewInstance(null, "Oriental region", "ORR");
643
       area.setUuid(UUID.randomUUID());
644
       area.setIdInVocabulary("ORR");
645
       state.putNamedArea(area);
646
       faunaEuAreaVocabulary.addTerm(area);
647
       if (txStatus == null){
648
           txStatus = startTransaction();
649
       }
650
       //txStatus = startTransaction();
651
       faunaEuAreaVocabulary = getVocabularyService().save(faunaEuAreaVocabulary);
652
       logger.info("save voc");
653
       commitTransaction(txStatus);
654
       state.setAreaVoc(faunaEuAreaVocabulary);
655

  
656

  
657
    }
658

  
659
    private void commitTaxaAndDistribution(
237 660
			FaunaEuropaeaImportState state,
238 661
			Set<UUID> taxonUuids,
239 662
			Map<UUID, FaunaEuropaeaDistributionTaxon> fauEuTaxonMap,
......
289 712
					presenceAbsenceStatus = FaunaEuropaeaTransformer.occStatus2PresenceAbsence(fauEuHelperDistribution.getOccurrenceStatusId());
290 713

  
291 714

  
292
					namedArea = FaunaEuropaeaTransformer.areaId2TdwgArea(fauEuHelperDistribution);
293

  
715
					namedArea = state.areaId2NamedArea(fauEuHelperDistribution, state);
294 716
					if (namedArea == null){
295
						UUID areaUuid= FaunaEuropaeaTransformer.getUUIDByAreaAbbr(fauEuHelperDistribution.getAreaCode());
296
						if (areaUuid == null){
297
							logger.warn("Area " + fauEuHelperDistribution.getAreaCode() + "not found in FE transformer");
298
						}
299
						namedArea = getNamedArea(state, areaUuid, fauEuHelperDistribution.getAreaName(), fauEuHelperDistribution.getAreaName(), fauEuHelperDistribution.getAreaCode(), null, null);
300

  
717
                        logger.warn("Area " + fauEuHelperDistribution.getAreaCode() + "not found in FE transformer");
718
                    }
719
					if (namedArea == null){
720
						//UUID areaUuid= FaunaEuropaeaTransformer.getUUIDByAreaAbbr(fauEuHelperDistribution.getAreaCode());
721
						//if (areaUuid == null){
722
							//logger.warn("Area " + fauEuHelperDistribution.getAreaCode() + "not found in FE transformer");
723
					//	}
724
//						namedArea = getNamedArea(state, areaUuid, fauEuHelperDistribution.getAreaName(), fauEuHelperDistribution.getAreaName(), fauEuHelperDistribution.getAreaCode(), null, null, state.getAreaVoc(), TermMatchMode.UUID_ABBREVLABEL);
725
//						namedArea.setIdInVocabulary(fauEuHelperDistribution.getAreaCode());
726
//					    state.putNamedArea(namedArea);
301 727
					}
302 728

  
303 729
					newDistribution = Distribution.NewInstance(namedArea, presenceAbsenceStatus);
304 730
					newDistribution.setCreated(null);
305 731

  
306 732
					taxonDescription.addElement(newDistribution);
733

  
307 734
				}
308 735
			}
309 736
		}
737

  
738
		taxonDescription= null;
739
		newDistribution = null;
740
		namedArea= null;
310 741
		return taxonList;
311 742
	}
312 743

  

Also available in: Unified diff