From: Katja Luther <k.luther@bgbm.org>
Date: Wed, 6 Sep 2017 12:31:58 +0000 (+0200)
Subject: merge conflict
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib-apps.git/commitdiff_plain/f9288024d35effc40f8273883f6050c4990b9487

merge conflict
---

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
index 21a5528e..dbd86616 100644
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
@@ -34,7 +34,7 @@ public class CdmDestinations {
 	public static ICdmDataSource cdm_test_local_faunaEu_mysql(){
 		DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
 		String cdmServer = "127.0.0.1";
-		String cdmDB = "cdm_faunaeu_2015_09";
+		String cdmDB = "cdm_faunaeu_2017_03";
 		String cdmUserName = "root";
 		return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
 	}
diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaAuthorImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaAuthorImport.java
index e767743e..849299f6 100644
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaAuthorImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaAuthorImport.java
@@ -47,11 +47,13 @@ public class FaunaEuropaeaAuthorImport extends FaunaEuropaeaImportBase {
 	private static int modCount = 1000;
 	private final static String authorSeparator = ", ";
 	private final static String lastAuthorSeparator = " & ";
+	private static String capitalWord = "\\p{javaUpperCase}\\p{javaLowerCase}*";
 	 protected static String fWs = "\\s*";
 	 protected static String oWs = "\\s+";
 	 protected static String finalTeamSplitter = "(" + fWs + "(&)" + fWs + "|" + oWs + "et" + oWs + ")";
 	protected static String notFinalTeamSplitter = "((?:" + fWs + "," + fWs + ")(?!([A-Z][\\.]))"+"|" + finalTeamSplitter + ")";
-	protected static String test = "(,\\s(?![A-Z][.|\\s|$]))|" + finalTeamSplitter ;
+	protected static String test = "(, \\s(?!([A-Z].|\\s|$))|,$)" ;
+	//protected static String test = "((,\\s("+capitalWord+")+)|(,($|,?!(\\s))))";
 
 
 	/* (non-Javadoc)
@@ -227,13 +229,17 @@ public class FaunaEuropaeaAuthorImport extends FaunaEuropaeaImportBase {
         //Lastname A, Lastname B & Lastname
         //Lastname A Lastname B & Lastname C
         //Lastname, J & Lastname, L
-        String[] teamMembers = refAuthor.split(test);
-
-        String lastMember;
+        String[] firstTeamMembers = refAuthor.split(finalTeamSplitter);
+        String[] teamMembers = null;
+        String lastMember = null;
+        lastMember = firstTeamMembers[firstTeamMembers.length-1];
 
+        if (firstTeamMembers.length == 2){
+            teamMembers = firstTeamMembers[0].split(test);
+        }
         Person teamMember;
         author = Team.NewInstance();
-        if (teamMembers.length>1){
+        if (teamMembers != null){
             for(String member:teamMembers){
                 if (!member.trim().equals("")){
                     teamMember = Person.NewInstance();
@@ -241,9 +247,25 @@ public class FaunaEuropaeaAuthorImport extends FaunaEuropaeaImportBase {
                    ((Team)author).addTeamMember(teamMember);
                 }
             }
+            teamMember = Person.NewInstance();
+            teamMember.setTitleCache(lastMember, true);
+            ((Team)author).addTeamMember(teamMember);
+
         }else{
-            author = Person.NewInstance();
-            author.setTitleCache(refAuthor, true);
+            teamMembers = lastMember.split(test);
+            if (teamMembers.length >1){
+                for(String member:teamMembers){
+                    if (!member.trim().equals("")){
+                        teamMember = Person.NewInstance();
+                        teamMember.setTitleCache(member, true);
+                       ((Team)author).addTeamMember(teamMember);
+                    }
+                }
+            }else{
+                author = Person.NewInstance();
+                author.setTitleCache(lastMember, true);
+            }
+
 
         }
         author.getTitleCache();
diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionImport.java
index 23697240..8ac5e18b 100644
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaDistributionImport.java
@@ -678,6 +678,8 @@ public class FaunaEuropaeaDistributionImport extends FaunaEuropaeaImportBase {
 				} else {
 					taxonDescription = TaxonDescription.NewInstance();
 					taxon.addDescription(taxonDescription);
+					taxonDescription.setDefault(true);
+					//addOriginalSource(taxonDescription, null, "Default Import", state.getConfig().getSourceReference());
 				}
 
 				taxonUuid = taxonBase.getUuid();
diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaVernacularNamesImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaVernacularNamesImport.java
index 6f24c611..5104a29a 100644
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaVernacularNamesImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaVernacularNamesImport.java
@@ -35,10 +35,12 @@ public class FaunaEuropaeaVernacularNamesImport extends FaunaEuropaeaImportBase
 	private static final Logger logger = Logger.getLogger(FaunaEuropaeaVernacularNamesImport.class);
 
 	private HashMap<String, Reference> sourceMap = new HashMap<String, Reference>();
+	private Reference pesiProject = ReferenceFactory.newDatabase();
 
 	@Override
 	protected void doInvoke(FaunaEuropaeaImportState state) {
 		int limit = state.getConfig().getLimitSave();
+		pesiProject.setTitle("PESI");
 
 		if (state.getConfig().isDoVernacularNames()){
 			/* Taxon store for retrieving taxa from and saving taxa to CDM */
@@ -231,8 +233,9 @@ public class FaunaEuropaeaVernacularNamesImport extends FaunaEuropaeaImportBase
 							+ taxonBase.getClass().getSimpleName() + " using accepted Taxon for vernacular name");
 					continue;
 				}
-
 				taxonDescription = TaxonDescription.NewInstance();
+				addOriginalSource(taxonDescription, null, "CommonNameDefaultImport", pesiProject);
+
 				taxon.addDescription(taxonDescription);
 
 				taxonUuid = taxonBase.getUuid();
@@ -297,7 +300,9 @@ public class FaunaEuropaeaVernacularNamesImport extends FaunaEuropaeaImportBase
 						verName.setArea(NamedArea.NORTH_AMERICA());
 					}
 					verName.setCreated(null);
-					addOriginalSource(verName, null, null, sourceMap.get(fauEuHelperVernacularName.getSource()));
+					if (fauEuHelperVernacularName.getSource() != null){
+					    addOriginalSource(verName, null, null, sourceMap.get(fauEuHelperVernacularName.getSource()));
+					}
 					taxonDescription.addElement(verName);
 
 				}