Project

General

Profile

« Previous | Next » 

Revision 375e8ab9

Added by Andreas Müller almost 16 years ago

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java
164 164
165 165 
					taxonDescription.addElement(textData);
166 166
167 
					//FIXME delete, just for testing
168 
					//commonNames
169 
					String commonNameString;
170 
					if (taxon.getName() != null){
171 
						commonNameString = "Common " + taxon.getName().getTitleCache();
172 
					}else{
173 
						commonNameString = "Common (null)";
174 
					}
175 
					Language language = bmiConfig.getFactLanguage();
176 
					language = null;
177 
					CommonTaxonName commonName = CommonTaxonName.NewInstance(commonNameString, language);
178 
					commonName.setFeature(commonNameFeature);
179 
					taxonDescription.addElement(commonName);
167 
//					//FIXME delete, just for testing
168 
//					//commonNames
169 
//					String commonNameString;
170 
//					if (taxon.getName() != null){
171 
//						commonNameString = "Common " + taxon.getName().getTitleCache();
172 
//					}else{
173 
//						commonNameString = "Common (null)";
174 
//					}
175 
//					Language language = bmiConfig.getFactLanguage();
176 
//					language = null;
177 
//					CommonTaxonName commonName = CommonTaxonName.NewInstance(commonNameString, language);
178 
//					commonName.setFeature(commonNameFeature);
179 
//					taxonDescription.addElement(commonName);
180 180
181 181 
					if (categoryFk == FACT_DESCRIPTION){
182 182 
						//;
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java
482 482 
						success = false;
483 483 
						return success;
484 484 
					}
485 
					//change conceptRef uuid
486 
					ReferenceBase sec = referenceStore.get(bmiConfig.getSourceSecId());
487 
					if (sec == null){
488 
						sec = nomRefStore.get(bmiConfig.getSourceSecId());
489 
					}
490 
					if (sec != null){
491 
						sec.setUuid(bmiConfig.getSecUuid());
492 
						logger.info("SecUuid changed to: " + bmiConfig.getSecUuid());
493 
					}
494 485 
				} // end resultSet
486
487 
				//change conceptRef uuid
488 
				ReferenceBase sec = referenceStore.get(bmiConfig.getSourceSecId());
489 
				if (sec == null){
490 
					sec = nomRefStore.get(bmiConfig.getSourceSecId());
491 
				}
492 
				if (sec != null){
493 
					sec.setUuid(bmiConfig.getSecUuid());
494 
					logger.info("SecUuid changed to: " + bmiConfig.getSecUuid());
495 
				}
496
495 497 
				//save and store in map
496 498 
				logger.info("Save nomenclatural references (" + nomRefCount + ")");
497 499 
				referenceService.saveReferenceAll(nomRefStore.objects());
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java
102 102 
	//TypeDesignation
103 103 
	public static TypeDesignationStatus typeStatusId2TypeStatus (int typeStatusId)  throws UnknownCdmTypeException{
104 104 
		switch (typeStatusId){
105 
			case 0: return null;
105 106 
			case 1: return TypeDesignationStatus.HOLOTYPE();
106 107 
			case 2: return TypeDesignationStatus.LECTOTYPE();
107 108 
			case 3: return TypeDesignationStatus.NEOTYPE();
......
131 132 
	 */
132 133 
	public static Rank rankId2Rank (int rankId) throws UnknownCdmTypeException{
133 134 
		switch (rankId){
135 
			case 0: return null;
134 136 
			case 1: return Rank.KINGDOM();
135 137 
			case 3: return Rank.SUBKINGDOM();
136 138 
			case 5: return Rank.PHYLUM();
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesIO.java
66 66 
			//get data from database
67 67 
			String strQuery =
68 68 
					" SELECT TypeDesignation.*, TypeStatus.Status " +
69 
					" FROM TypeDesignation INNER JOIN" +
69 
					" FROM TypeDesignation LEFT OUTER JOIN " +
70 70 
                      	" TypeStatus ON TypeDesignation.TypeStatusFk = TypeStatus.TypeStatusId " +
71 71 
                    " WHERE (1=1) ";
72 72 
			ResultSet rs = source.getResultSet(strQuery) ;

Also available in: Unified diff