/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision b1fc732c

Added by Andreas Müller over 7 years ago

ID b1fc732ca50b7c85f2ef42ac4c83bd5ffb76448e
Parent 86ea4f4a
Child acf4e805

ref #3934 latest changes to Salvador import

+    				}
     				result.put(factCategoryId, feature);
     				if (createFeatureTree){
     				if (createFeatureTree && isPublicFeature(factCategoryId)){
     				    featureTree.getRoot().addChild(FeatureNode.NewInstance(feature));
+    				}
+    			}
     			if (createFeatureTree){
     			    featureTree.getRoot().addChild(FeatureNode.NewInstance(Feature.DISTRIBUTION()),2);
                     featureTree.getRoot().addChild(FeatureNode.NewInstance(Feature.NOTES()), featureTree.getRoot().getChildCount()-1);
     			    getFeatureTreeService().save(featureTree);
+    			}
     			return result;
-...
+    		}
     		//all others (no image) -> getDescription
     		else{
     			boolean isPublic = ! (categoryFk == 1800 || categoryFk == 1900 || categoryFk == 2000);
     			boolean isPublic = isPublicFeature(categoryFk);
     		    for (TaxonDescription desc: descriptionSet){
     			    if (! desc.isImageGallery()){
-...
+    	}
         /**
          * @param categoryFk
          * @return
          */
         private boolean isPublicFeature(Integer categoryFk) {
             return ! (categoryFk == 1800 || categoryFk == 1900 || categoryFk == 2000);
+        }
     	@Override
     	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
     		String nameSpace;
-...
         		        vol = "2012";
         		        page = intFact + (intFact < 255 ? 3 : 4);
+        		    }
                     String description = getSalvadorImageTitle(intFact);
                     String title = getSalvadorImageTitle(intFact, vol);
                     media.putTitle(Language.LATIN(), title);
                     String description = getSalvadorImageDescription(intFact);
                     media.putDescription(Language.SPANISH_CASTILIAN(), description);
         		    Reference ref = getSalvadorReference(vol);
-...
+    	}
     	private Map<Integer, String[]> salvadorImages = null;
         private String getSalvadorImageTitle(Integer intFact) {
     	/**
          * @param intFact
          * @param vol
          * @return
          */
         private String getSalvadorImageTitle(Integer intFact, String vol) {
             initSalvadorImagesFile();
             String[] line = salvadorImages.get(intFact);
             if (line == null){
                 logger.warn("Could not find salvador image metadata for " + intFact);
                 return String.valueOf(intFact);
             }else{
                 String name = getSalvadorImageNameInfo(intFact);
                 String result = UTF8.ENGLISH_QUOT_START +  name + UTF8.ENGLISH_QUOT_END + " [Berendsohn & al. " + vol + "]";
                 return result;
+            }
+        }
         private Map<Integer, String[]> salvadorImages = null;
         private String getSalvadorImageDescription(Integer intFact) {
             initSalvadorImagesFile();
             String[] line = salvadorImages.get(intFact);
             if (line == null){

     import eu.etaxonomy.cdm.model.common.Extension;
     import eu.etaxonomy.cdm.model.common.ExtensionType;
     import eu.etaxonomy.cdm.model.common.Language;
     import eu.etaxonomy.cdm.model.description.Feature;
     import eu.etaxonomy.cdm.model.description.TaxonDescription;
     import eu.etaxonomy.cdm.model.description.TextData;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-...
     	 * @param notes
          */
         private void makeTaxonomicNote(BerlinModelImportState state, Taxon taxon, String notes) {
             TaxonDescription desc = getTaxonDescription(taxon, false, true);
             desc.addElement(TextData.NewInstance(notes, Language.SPANISH_CASTILIAN(), null));
             if (isNotBlank(notes)){
                 TaxonDescription desc = getTaxonDescription(taxon, false, true);
                 desc.setDefault(true);  //hard coded for Salvador, not used elsewhere as far as I can see
                 TextData textData = TextData.NewInstance(Feature.NOTES() , notes, Language.SPANISH_CASTILIAN(), null);
                 desc.addElement(textData);
+            }
+        }
         @Override

Also available in: Unified diff

Project

General

Profile

EDIT

Revision b1fc732c

Added by Andreas Müller over 7 years ago