Project

General

Profile

« Previous | Next » 

Revision 9c021029

Added by Andreas Müller over 1 year ago

ref #10097 change originalNameString to originalInfo in cdmlib

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
406 406
     * Tries to create the best name (without authors) that makes an original spelling name for the nameToBeFilled.
407 407
     */
408 408
    private void handleOriginalSpelling(INonViralName nameToBeFilled) {
409
        if (nameToBeFilled.getNomenclaturalSource()== null || CdmUtils.isBlank(nameToBeFilled.getNomenclaturalSource().getOriginalNameString())){
409
        if (nameToBeFilled.getNomenclaturalSource()== null || CdmUtils.isBlank(nameToBeFilled.getNomenclaturalSource().getOriginalInfo())){
410 410
            return;
411 411
        }
412
        String originalNameString = nameToBeFilled.getNomenclaturalSource().getOriginalNameString();
412
        String originalInfo = nameToBeFilled.getNomenclaturalSource().getOriginalInfo();
413 413

  
414 414
        final int n = 5;
415 415
        String nameSplit[] = new String[n];
......
418 418
        nameSplit[2] = nameToBeFilled.getSpecificEpithet();
419 419
        nameSplit[3] = nameToBeFilled.getRank()== null? null : nameToBeFilled.getRank().getAbbreviation();
420 420
        nameSplit[4] = nameToBeFilled.getInfraSpecificEpithet();
421
        String originalNameSplit[] = originalNameString.split(" ");
421
        String originalNameSplit[] = originalInfo.split(" ");
422 422

  
423 423
        int bestOffset = -1;
424 424
        int bestDiff = Integer.MAX_VALUE;
......
465 465
        originalName.setInfraSpecificEpithet(finalSplit[4]);
466 466

  
467 467
        nameToBeFilled.setOriginalSpelling(originalName);
468
        nameToBeFilled.setOriginalNameString(null);
468
        nameToBeFilled.setOriginalInfo(null);
469 469
        return;
470 470
    }
471 471

  
......
521 521
	}
522 522

  
523 523
	/**
524
     * Extracts the original spelling string and adds it to the original source as <code>originalNameString</code>.
524
     * Extracts the original spelling string and adds it to the original source as <code>originalInfo</code>.
525 525
     * The original spelling part is deleted from the reference String.
526 526
     * @return  String the new (shortend) reference String
527 527
     */
......
534 534
            String originalSpellingPhrase = hasOrginalSpellingMatcher.group(0);
535 535
            String originalSpellingStr = originalSpellingPhrase.substring(originalSpellingStart.length());
536 536
            originalSpellingStr = originalSpellingStr.substring(0, originalSpellingStr.length() - originalSpellingEnd.length()+1);
537
            nameToBeFilled.setOriginalNameString(originalSpellingStr);
537
            nameToBeFilled.setOriginalInfo(originalSpellingStr);
538 538
            fullString = fullString.replace(originalSpellingPhrase, "").trim();
539 539
        }
540 540

  

Also available in: Unified diff