Revision 7650207f
Added by Andreas Müller almost 3 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java | ||
---|---|---|
24 | 24 |
import static eu.etaxonomy.cdm.io.common.ImportHelper.OBLIGATORY; |
25 | 25 |
import static eu.etaxonomy.cdm.io.common.ImportHelper.OVERWRITE; |
26 | 26 |
|
27 |
import eu.etaxonomy.cdm.common.URI; |
|
28 | 27 |
import java.net.URISyntaxException; |
29 | 28 |
import java.sql.ResultSet; |
30 | 29 |
import java.sql.SQLException; |
... | ... | |
44 | 43 |
|
45 | 44 |
import eu.etaxonomy.cdm.common.CdmUtils; |
46 | 45 |
import eu.etaxonomy.cdm.common.DOI; |
46 |
import eu.etaxonomy.cdm.common.URI; |
|
47 | 47 |
import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer; |
48 | 48 |
import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelReferenceImportValidator; |
49 | 49 |
import eu.etaxonomy.cdm.io.common.ICdmImport; |
... | ... | |
1225 | 1225 |
return result; |
1226 | 1226 |
} |
1227 | 1227 |
|
1228 |
/** |
|
1229 |
* @param team |
|
1230 |
* @param refAuthorString |
|
1231 |
* @param refId |
|
1232 |
*/ |
|
1233 | 1228 |
private static void checkTeam(Team team, String refAuthorString, Integer refId) { |
1234 | 1229 |
TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.getCacheStrategy(); |
1235 |
formatter.setEtAlPosition(100); |
|
1230 |
|
|
1236 | 1231 |
if (formatter.getTitleCache(team).equals(refAuthorString)){ |
1237 | 1232 |
team.setProtectedTitleCache(false); |
1238 | 1233 |
}else if(formatter.getTitleCache(team).replace(" & ", ", ").equals(refAuthorString.replace(" & ", ", ").replace(" ,", ","))){ |
... | ... | |
1248 | 1243 |
team.setTitleCache(refAuthorString, true); |
1249 | 1244 |
logger.warn("Creation of titleCache for team with members did not (fully) work: " + refAuthorString + " <-> " + formatter.getTitleCache(team)+ " : " + refId); |
1250 | 1245 |
} |
1251 |
|
|
1252 | 1246 |
} |
1253 | 1247 |
|
1254 |
/** |
|
1255 |
* @param hasDedupMember |
|
1256 |
* @param result |
|
1257 |
* @return |
|
1258 |
*/ |
|
1259 | 1248 |
private static void checkPerson(Person person, String refAuthorString, boolean hasDedupMember, Integer refId) { |
1260 | 1249 |
PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.getCacheStrategy(); |
1261 | 1250 |
|
... | ... | |
1294 | 1283 |
} |
1295 | 1284 |
} |
1296 | 1285 |
|
1297 |
/** |
|
1298 |
* @param refAuthorString |
|
1299 |
* @return |
|
1300 |
*/ |
|
1301 | 1286 |
private static boolean containsEdOrColon(String str) { |
1302 | 1287 |
if (str.contains(" ed.") || str.contains(" Ed.") || str.contains("(ed.") |
1303 | 1288 |
|| str.contains("[ed.") || str.contains("(Eds)") || str.contains("(Eds.)") || |
Also available in: Unified diff
adaptions to 5.23 and prior