Project

General

Profile

« Previous | Next » 

Revision d7919b1c

Added by Andreas Müller about 7 years ago

ref #6362, ref #6365 remove occurrence of NonViralName, BotanicalName, ZoologicalName and others

View differences:

cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/ipni/IpniService.java
43 43 
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
44 44 
import eu.etaxonomy.cdm.model.common.TimePeriod;
45 45 
import eu.etaxonomy.cdm.model.name.BotanicalName;
46 
import eu.etaxonomy.cdm.model.name.IBotanicalName;
46 47 
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
47 48 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
48 49 
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
49 50 
import eu.etaxonomy.cdm.model.name.Rank;
51 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
50 52 
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
51 53 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
52 54 
import eu.etaxonomy.cdm.model.reference.Reference;
......
260 262 
                                                     serviceUrl.getPath()
261 263 
                                                     + "?" + request);
262 264 

  		




  263
  
  
    

  		




  264
  265
  
    
            URI newUri = newUrl.toURI();


  		




  265
  
  
    

  		




  266
  266
  
    
            logger.info("Firing request for URI: " + newUri);


  		




  267
  
  
    

  		




  268
  267
  
    
            HttpResponse response = UriUtils.getResponse(newUri, null);


  		




  269
  268
  
    

  		




  270
  269
  
    
            int responseCode = response.getStatusLine().getStatusCode();


  		




  ......




  434
  433
  
    
	}


  		




  435
  434
  
    

  		




  436
  435
  
    

  		




  437
  
  
    
	private List<BotanicalName> buildNameList( InputStream content, ICdmApplicationConfiguration appConfig, IIpniServiceConfigurator iConfig) throws IOException {


  		




  
  436
  
    
	private List<TaxonNameBase<?,?>> buildNameList( InputStream content, ICdmApplicationConfiguration appConfig, IIpniServiceConfigurator iConfig) throws IOException {


  		




  438
  437
  
    
		IpniServiceNamesConfigurator config = (IpniServiceNamesConfigurator)iConfig;


  		




  439
  
  
    
		List<BotanicalName> result = new ArrayList<BotanicalName>();


  		




  
  438
  
    
		List<TaxonNameBase<?,?>> result = new ArrayList<>();


  		




  440
  439
  
    
		BufferedReader reader = new BufferedReader (new InputStreamReader(content));


  		




  441
  440
  
    

  		




  442
  441
  
    
		String headerLine = reader.readLine();


  		




  ......




  445
  444
  
    
		String line = reader.readLine();


  		




  446
  445
  
    
		while (StringUtils.isNotBlank(line)){


  		




  447
  446
  
    

  		




  448
  
  
    
			BotanicalName name = getNameFromLine(line,parameterMap, appConfig);


  		




  
  447
  
    
		    TaxonNameBase<?,?> name = (TaxonNameBase<?,?>)getNameFromLine(line,parameterMap, appConfig);


  		




  449
  448
  
    
			result.add(name);


  		




  450
  449
  
    
			line = reader.readLine();


  		




  451
  450
  
    

  		




  ......




  456
  455
  
    
	}


  		




  457
  456
  
    

  		




  458
  457
  
    

  		




  459
  
  
    
	private BotanicalName getNameFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationConfiguration appConfig) {


  		




  
  458
  
    
	private IBotanicalName getNameFromLine(String line, Map<Integer, String> parameterMap, ICdmApplicationConfiguration appConfig) {


  		




  460
  459
  
    
		//Id%Version%Standard form%Default author forename%Default author surname%Taxon groups%Dates%Alternative names


  		




  461
  460
  
    
		String[] splits = line.split("%");


  		




  462
  461
  
    
		Map<String, String> valueMap = new HashMap<String, String>();


  		




  ......




  465
  464
  
    
			valueMap.put(parameterMap.get(i), splits[i]);


  		




  466
  465
  
    
		}


  		




  467
  466
  
    

  		




  468
  
  
    
		BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null);


  		




  
  467
  
    
		IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null);


  		




  469
  468
  
    

  		




  470
  469
  
    
		//caches


  		




  471
  470
  
    
		name.setNameCache(valueMap.get(FULL_NAME_WITHOUT_FAMILY_AND_AUTHORS), true);


  		




  ......




  514
  513
  
    
		name.addAnnotation(annotation);


  		




  515
  514
  
    

  		




  516
  515
  
    
		//basionym


  		




  517
  
  
    
		BotanicalName basionym = TaxonNameFactory.NewBotanicalInstance(null);


  		




  
  516
  
    
		TaxonNameBase<?,?> basionym = TaxonNameFactory.NewBotanicalInstance(null);


  		




  518
  517
  
    
		basionym.setTitleCache(valueMap.get(BASIONYM), true);


  		




  519
  518
  
    
		name.addBasionym(basionym);


  		




  520
  519
  
    

  		




  521
  520
  
    
		//replaced synonym


  		




  522
  
  
    
		BotanicalName replacedSynoynm = TaxonNameFactory.NewBotanicalInstance(null);


  		




  
  521
  
    
		TaxonNameBase<?,?> replacedSynoynm = TaxonNameFactory.NewBotanicalInstance(null);


  		




  523
  522
  
    
		replacedSynoynm.setTitleCache(valueMap.get(REPLACED_SYNONYM), true);


  		




  524
  523
  
    
		name.addReplacedSynonym(replacedSynoynm, null, null, null);


  		




  525
  524
  
    

  		












Also available in:  Unified diff