minor logging improvements
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 18 Jan 2012 12:17:27 +0000 (12:17 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 18 Jan 2012 12:17:27 +0000 (12:17 +0000)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java

index f51d86436d4b04eb81f033f00ad7f8da29b1eae8..c2490b4046311a11d27ce0c7cc6f09d8372e9cdd 100644 (file)
 package eu.etaxonomy.cdm.io.berlinModel.in;\r
 \r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_HAS_SAME_TYPE_AS;\r
+import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_ALTERNATIVE_NAME_FOR;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_BASIONYM_FOR;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_CONSERVED_TYPE_OF;\r
-import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_VALIDATION_OF;\r
-import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_LATER_VALIDATION_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_FEMALE_PARENT_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_FIRST_PARENT_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_LATER_HOMONYM_OF;\r
+import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_LATER_VALIDATION_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_LECTOTYPE_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_MALE_PARENT_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_ORTHOGRAPHIC_VARIANT_OF;\r
-import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_ALTERNATIVE_NAME_FOR;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_REJECTED_TYPE_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_REPLACED_SYNONYM_FOR;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_SECOND_PARENT_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_TYPE_OF;\r
+import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_IS_VALIDATION_OF;\r
 import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_REL_TYPE_NOT_DESIGNATED;\r
 \r
 import java.lang.reflect.Method;\r
@@ -150,9 +150,8 @@ public class BerlinModelTaxonNameRelationImport extends BerlinModelImportBase {
                                String rule = null;  \r
                                \r
                                if (nameFrom != null && nameTo != null){\r
-                                       success = handleNameRelationship(success, config, name1Id, name2Id,\r
-                                                       relQualifierFk, notes, nameFrom, nameTo, citation,\r
-                                                       microcitation, rule);\r
+                                       success = handleNameRelationship(success, config, name1Id, name2Id,     relQualifierFk, \r
+                                                       notes, nameFrom, nameTo, citation, microcitation, rule);\r
                                        nameFrom.setTitleCache(null);\r
                                        nameTo.setTitleCache(null);\r
                                        nameFrom.getTitleCache();\r
@@ -165,10 +164,10 @@ public class BerlinModelTaxonNameRelationImport extends BerlinModelImportBase {
                                }else{\r
                                        //TODO\r
                                        if (nameFrom == null){\r
-                                                logger.warn("from TaxonName " + name1Id + "  for RelName (" + relNameId + ") does not exist in store");\r
+                                                logger.warn("from TaxonName " + name1Id + "  for RelName (" + relNameId + " , type: " + relQualifierFk + ") does not exist in store. ToName is: " + (nameTo == null ? "" : nameTo.getTitleCache()));\r
                                        }\r
                                        if (nameTo == null){\r
-                                               logger.warn("to TaxonName " + name2Id + " for RelName (" + relNameId + ") does not exist in store");\r
+                                               logger.warn("to TaxonName " + name2Id + " for RelName (" + relNameId + " , type: " + relQualifierFk + ") does not exist in store. FromName is: "  + (nameFrom == null ? "" : nameFrom.getTitleCache()));\r
                                        }\r
                                        success = false;\r
                                }\r