Project

General

Profile

« Previous | Next » 

Revision 8fb964f0

Added by Andreas Müller over 4 years ago

ref #2826 cleanup

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumSupraGeneraImport.java
50 50
		String strRecordQuery =
51 51
			" SELECT * " +
52 52
			" FROM [tblSupragenericNames] " +
53
//			" WHERE ( dr.id IN (" + ID_LIST_TOKEN + ") )";
54 53
			"";
55 54
		return strRecordQuery;
56 55
	}
......
59 58
	protected void doInvoke(IndexFungorumImportState state) {
60 59

  
61 60
	    logger.info("Start supra genera ...");
62
		//handle source reference first
61

  
62
	    //handle source reference first
63 63
		Reference sourceReference = state.getConfig().getSourceReference();
64 64
		getReferenceService().save(sourceReference);
65 65

  
......
77 77

  
78 78
				//Don't use (created by Marc): DisplayName, NomRefCache
79 79

  
80
				Integer id = ((Number)rs.getObject(COL_RECORD_NUMBER)).intValue();
80
				Integer id = rs.getInt(COL_RECORD_NUMBER);
81 81

  
82 82
				String supragenericNames = rs.getString(SUPRAGENERIC_NAMES);
83
				//String preferredName = rs.getString("PreferredName");
84 83
				Integer rankFk = rs.getInt("PESI_RankFk");
85 84

  
86 85
				//name
87 86
				Rank rank = state.getTransformer().getRankByKey(String.valueOf(rankFk));
88 87
				TaxonName name = TaxonNameFactory.NewBotanicalInstance(rank);
89 88
				name.setGenusOrUninomial(supragenericNames);
90
				/*if (preferredName != null && !preferredName.equals(supragenericNames)){
91
					logger.warn("Suprageneric names and preferredName is not equal. This case is not yet handled by IF import. I take SupragenericNames for import. RECORD NUMBER" +id);
92
				}*/
93 89

  
94 90
				//taxon
95 91
				Taxon taxon = Taxon.NewInstance(name, sourceReference);
96 92
				//author + nom.ref.
97 93
				makeAuthorAndPublication(state, rs, name);
98 94
				//source
99
//				if (id != null){
100
					makeSource(state, taxon, id.intValue(), NAMESPACE_SUPRAGENERIC_NAMES );
101
//				} else{
102
//					makeSource(state, taxon, null, NAMESPACE_SUPRAGENERIC_NAMES);
103
//				}
95
				makeSource(state, taxon, id, NAMESPACE_SUPRAGENERIC_NAMES );
96

  
104 97
				getTaxonService().saveOrUpdate(taxon);
105 98
			}
106 99
		} catch (Exception e) {

Also available in: Unified diff