Project

General

Profile

« Previous | Next » 

Revision 49828

1. Change log4j properties file.
2. Add method to create researcher from bulk import csv
3. Change csv handling on bulk import
4. Modify request unit test.

View differences:

RequestDAO.java
825 825
		return result;
826 826
	}
827 827

  
828
	public Request getRequestFromCSV(User user, Project project, Publication publication, String acceptanceDate,
829
									 String identifierType, String identifierValue,
828
	public Request getRequestFromCSV(User user, Project project, Publication publication, Organization organization,
829
									 String acceptanceDate, String identifierType, String identifierValue,
830 830
									 String apc, String apcCurrency, String discount) throws ParseException {
831 831

  
832 832
		Request request = new Request();
833
		request.setProject(project);
833 834
		request.setUser(user);
834
		request.setProject(project);
835
		request.setResearcher(user);
835 836

  
836 837
		publication.setAcceptancedate(new SimpleDateFormat("yyyy-MM-dd").parse(acceptanceDate));
837 838

  
......
843 844

  
844 845
		publication.getIdentifiers().add(id);
845 846

  
847
		request.setOrganization(organization);
846 848
		request.setApc(apc!=null?Float.parseFloat(apc):null);
847 849
		request.setCurrency(apcCurrency!=null?Currency.valueOf(apcCurrency):null);
848 850
		request.setDiscount(discount!=null?Float.parseFloat(discount):null);

Also available in: Unified diff