Project

General

Profile

« Previous | Next » 

Revision 0123bc60

Added by Andreas Müller over 4 years ago

ref #5499 fix et al. author import

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/edaphobase/EdaphobaseAuthorImport.java
101 101
                authorStr = authorStr.replace(" et ", " & ");
102 102

  
103 103
                boolean isEtAl = false;
104
                String noEtAlAuthorStr = authorStr;
104 105
                if (authorStr.endsWith(" & al.")){
105 106
                    isEtAl = true;
106
                    authorStr = authorStr.substring(0, authorStr.length()-6).trim();
107
                    noEtAlAuthorStr = authorStr.substring(0, authorStr.length()-6).trim();
107 108
                }
108 109

  
109
                String[] splits = authorStr.split("\\s*&\\s*");
110
                String[] splits = noEtAlAuthorStr.split("\\s*&\\s*");
110 111
                for (String split : splits){
111 112
                    String[] commaSplits = split.split("\\s*,\\s*");
112 113
                    for (String commaSplit : commaSplits){
app-import/src/main/java/eu/etaxonomy/cdm/io/edaphobase/EdaphobaseTaxonImport.java
189 189
        isValid = checkValid(state, id, isValid);
190 190

  
191 191
        //for debug only
192
        if (id.equals(97600) || id.equals(97601)){
192
        if (id.equals(979370000) ){
193 193
            logger.debug("now");
194 194
        }
195 195

  
......
505 505
        try {
506 506
            while (rs.next()){
507 507
                String authorStr = rs.getString("tax_author_name");
508
                authorSet.add(authorStr);
508
                if (authorStr != null){
509
                    authorStr = authorStr.replace(" et ", " & ");
510
                    authorSet.add(authorStr);
511
                }
509 512
                handleForeignKey(rs, referenceIdSet, "tax_document");
510 513
            }
511 514
        } catch (SQLException e) {

Also available in: Unified diff