update Globis import

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / globis / GlobisImageImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java
index 499c8ac9b769b3669eeb6ec23a9b6d07655cafa6..6f7ac355145cae55828b5b7f508a789868ec2945 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java
@@ -33,7 +33,6 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.strategy.exceptions.StringNotParsableException;\r
 import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;\r
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;\r
 \r
@@ -218,7 +217,7 @@ public class GlobisImageImport  extends GlobisImportBase<Taxon> {
                if (taxon == null){\r
                        ZoologicalName name = ZoologicalName.NewInstance(rank);\r
                        taxon = Taxon.NewInstance(name, state.getTransactionalSourceReference());\r
-                       handleAuthor(author, name);\r
+                       handleAuthorAndYear(author, name);\r
                        getTaxonService().save(taxon);\r
                }\r
                \r
@@ -261,7 +260,7 @@ public class GlobisImageImport  extends GlobisImportBase<Taxon> {
                        zooName.setInfraSpecificEpithet(subGenusEpi);\r
                }\r
                zooName.setGenusOrUninomial(genusEpi);\r
-               handleAuthor(author, zooName);\r
+               handleAuthorAndYear(author, zooName);\r
                \r
                Taxon taxon = Taxon.NewInstance(zooName, state.getTransactionalSourceReference());\r
                \r
@@ -269,21 +268,6 @@ public class GlobisImageImport  extends GlobisImportBase<Taxon> {
        }\r
 \r
 \r
-\r
-\r
-       /**\r
-        * @param author\r
-        * @param zooName\r
-        */\r
-       private void handleAuthor(String author, ZoologicalName zooName) {\r
-               try {\r
-                       parser.parseAuthors(zooName, author);\r
-               } catch (StringNotParsableException e) {\r
-                       logger.warn("Author could not be parsed: " + author);\r
-                       zooName.setAuthorshipCache(author, true);\r
-               }\r
-       }\r
-\r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)\r
         */\r