Project

General

Profile

« Previous | Next » 

Revision 3e8514a9

Added by Katja Luther almost 8 years ago

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiDestinations.java
59 59
		//	CDM - PESI
60 60
		String dbms = Source.SQL_SERVER_2008;
61 61
		String strServer = "pesiimport3"; //192.168.1.223
62
		String strDB = "CDM_IF2PESI";
62
		String strDB = "CDMTMP_IF2PESI";
63 63
		int port = 1433;
64 64
		String userName = "pesiExportFaunaEu";
65 65
		return makeSource(dbms, strServer, strDB, port, userName, null);
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumTransformer.java
55 55
		}
56 56
		Integer rankFk = Integer.valueOf(key);
57 57
		switch (rankFk){
58
			case 30: return Rank.DIVISION();
58
			case 10: return Rank.KINGDOM();
59
 			case 30: return Rank.DIVISION();
59 60
			case 40: return Rank.SUBDIVISION();
60 61
			case 60: return Rank.CLASS();
61 62
			case 70: return Rank.SUBCLASS();
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportBase.java
84 84
			}
85 85
			taxonBase = null;
86 86
		}
87
		
87
		it = null;
88 88
		return list;
89 89
	}
90 90
	
......
365 365
				}
366 366
				
367 367
			}
368
			
368 369
			//handle PESI accepted taxa
369 370
			if (! taxon.isMisapplication()){
370 371
				for (Marker marker : taxon.getMarkers()){
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java
488 488
		if (list == null ) {
489 489
			logger.info("No " + pluralString + " left to fetch.");
490 490
		}
491
		
491
		list = null;
492 492
		// Commit transaction
493 493
		commitTransaction(txStatus);
494 494
		
......
510 510
									       " VALUES (" + biotaId + ",    0,    0,   'Superdomain',   'Biota',          'Biota',  '<i>Biota</i>',   'Biota', '<i>Biota</i>',  1 ,      'accepted')";
511 511
				state.getConfig().getDestination().update(sqlInsertBiota);
512 512
			}
513
			rs = null;
513 514
		} catch (SQLException e) {
514 515
			logger.warn ("Biota could not be requested or inserted");
515 516
		}
517
		
516 518
	}
517 519
	
518 520
	// 4th round: Add TreeIndex to each taxon
......
1033 1035
			logger.error("TaxonCount could not be determined: " + e.getMessage());
1034 1036
			e.printStackTrace();
1035 1037
		}
1038
		resultSet = null;
1036 1039
		return result;
1037 1040
	}
1038 1041
	
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java
259 259
	// Plantae Ranks
260 260
	public static int Plantae_Kingdom = 10;
261 261
	public static int Plantae_Subkingdom = 20;
262
	public static int Plantae_Phylum = 20;
263
	public static int Plantae_Subphylum = 20;
262 264
	public static int Plantae_Division = 30;
263 265
	public static int Plantae_Subdivision = 40;
264 266
	public static int Plantae_Class = 60;
......
863 865
					this.taxRelZooQualifierCacheMap.put(key, zoologCache);
864 866
				}
865 867
			}
866
					
868
			rs = null;		
867 869
		} catch (SQLException e) {
868 870
			logger.error("SQLException when trying to read area map", e);
869 871
			e.printStackTrace();
......
1732 1734
				result = Plantae_Kingdom;
1733 1735
			} else if (rank.equals(Rank.SUBKINGDOM())) {
1734 1736
				result = Plantae_Subkingdom;
1735
			} else if (rank.equals(Rank.DIVISION())) {
1737
			}else if (rank.equals(Rank.PHYLUM())) {
1738
				result = Plantae_Phylum;
1739
			}else if (rank.equals(Rank.SUBPHYLUM())) {
1740
				result = Plantae_Subphylum;
1741
			}else if (rank.equals(Rank.DIVISION())) {
1736 1742
				result = Plantae_Division;
1737 1743
			} else if (rank.equals(Rank.SUBDIVISION())) {
1738 1744
				result = Plantae_Subdivision;

Also available in: Unified diff