Project

General

Profile

« Previous | Next » 

Revision 9a5383de

Added by Andreas Müller over 9 years ago

update app-import to poi-ooxml and 3.10

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/synthesysImport/SynthesysCacheActivator.java
18 18
import java.util.ListIterator;
19 19

  
20 20
import org.apache.log4j.Logger;
21
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
21
import org.apache.poi.ss.usermodel.Workbook;
22 22
import org.springframework.transaction.TransactionStatus;
23 23

  
24 24
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
......
33 33
import eu.etaxonomy.cdm.model.agent.Person;
34 34
import eu.etaxonomy.cdm.model.common.Language;
35 35
import eu.etaxonomy.cdm.model.common.LanguageString;
36
import eu.etaxonomy.cdm.model.location.Country;
36 37
import eu.etaxonomy.cdm.model.location.NamedArea;
37 38
import eu.etaxonomy.cdm.model.location.Point;
38
import eu.etaxonomy.cdm.model.location.Country;
39 39
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
40 40
import eu.etaxonomy.cdm.model.occurrence.Collection;
41 41
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
......
77 77
	
78 78
	static ICdmDataSource desitination = CdmDestinations.localH2();
79 79
	
80
	protected HSSFWorkbook hssfworkbook = null;
81

  
82 80

  
83 81
	public void saveUnit(HashMap<String,String> unit){
84 82
		String author = unit.get("author");
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
23 23
import java.util.UUID;
24 24

  
25 25
import org.apache.log4j.Logger;
26
import org.apache.poi.hssf.usermodel.HSSFCell;
27
import org.apache.poi.hssf.usermodel.HSSFRow;
28
import org.apache.poi.hssf.usermodel.HSSFSheet;
29
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
30
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
26
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
27
import org.apache.poi.ss.usermodel.Cell;
28
import org.apache.poi.ss.usermodel.Row;
29
import org.apache.poi.ss.usermodel.Sheet;
30
import org.apache.poi.ss.usermodel.Workbook;
31
import org.apache.poi.ss.usermodel.WorkbookFactory;
31 32

  
32 33
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
33 34
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
......
51 52
import eu.etaxonomy.cdm.model.common.LanguageString;
52 53
import eu.etaxonomy.cdm.model.common.Marker;
53 54
import eu.etaxonomy.cdm.model.common.MarkerType;
54
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
55 55
import eu.etaxonomy.cdm.model.common.TermType;
56 56
import eu.etaxonomy.cdm.model.common.TermVocabulary;
57 57
import eu.etaxonomy.cdm.model.common.TimePeriod;
......
102 102
		return destination;
103 103
	}
104 104

  
105
	public boolean importFromExcelSS(String xlsPath) {
105
	public boolean importFromExcelSS(String xlsPath) throws InvalidFormatException {
106 106
		boolean success = true;
107 107
		
108 108
		CdmApplicationController applicationController = CdmApplicationController.NewInstance(dataSource());
......
124 124
			e.printStackTrace();
125 125
		}
126 126

  
127
		POIFSFileSystem fileSystem = null;
127
//		POIFSFileSystem fileSystem = null;
128 128
		
129 129
		try {
130
			fileSystem = new POIFSFileSystem(inputStream);
130
//			fileSystem = new POIFSFileSystem(inputStream);
131
//
132
//			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
133
			Workbook workBook = WorkbookFactory.create(inputStream);
131 134

  
132
			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
133
			HSSFSheet sheet = workBook.getSheetAt(0);
134
			Iterator rows = sheet.rowIterator();
135
			
136
			Sheet sheet = workBook.getSheetAt(0);
137
			Iterator<Row> rows = sheet.rowIterator();
135 138
			// Iterator rows = sheet.rowIterator();
136 139
			ArrayList<ArrayList<String>> lstUpdates = new ArrayList<ArrayList<String>>();
137 140
			Set<Integer> lstTaxonIDs = new HashSet<Integer>();
......
140 143

  
141 144
			while (rows.hasNext()) {
142 145

  
143
				HSSFRow row = (HSSFRow) rows.next();
146
				Row row = rows.next();
144 147
				System.out.println("Row No.: " + row.getRowNum());
145
				Iterator cells = row.cellIterator();
148
				Iterator<Cell> cells = row.cellIterator();
146 149
				ArrayList<String> lstTaxon = new ArrayList<String>();
147 150
				while (cells.hasNext()) {
148
					HSSFCell cell = (HSSFCell) cells.next();
151
					Cell cell = cells.next();
149 152
				
150 153
					int intCellType = cell.getCellType();
151 154
					switch (intCellType) {
......
257 260

  
258 261
	}
259 262
	
260
	private boolean loadUses() {
263
	private boolean loadUses() throws InvalidFormatException {
261 264
		boolean success = true;
262 265
		//String xslUseSummaryPathString = "C://workspace//Matched_UseSummary_referenceIdTaxEd_TaxonName.xls";
263 266
		//String xslUseSummaryPathString = "C://workspace//testUseSummaries.xls";
......
491 494
	}
492 495
	
493 496
	//Completed and tested!
494
	private boolean loadTerms() {
497
	private boolean loadTerms() throws InvalidFormatException {
495 498
		boolean success = true;
496 499
		
497 500
		//String xslPathString = "C://workspace//terms.xls";
......
523 526
			e.printStackTrace();
524 527
		}
525 528

  
526
		POIFSFileSystem fileSystem = null;
527
		
529
	
528 530
		try {
529
			fileSystem = new POIFSFileSystem(inputStream);
531
//			POIFSFileSystem fileSystem = new POIFSFileSystem(inputStream);
532
//			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
530 533

  
531
			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
532
			HSSFSheet sheet = workBook.getSheetAt(0);
533
			Iterator rows = sheet.rowIterator();
534
			Workbook workBook = WorkbookFactory.create(inputStream);
535

  
536
			
537
			Sheet sheet = workBook.getSheetAt(0);
538
			Iterator<Row> rows = sheet.rowIterator();
534 539

  
535 540
			ArrayList<ArrayList<String>> lstUpdates = new ArrayList<ArrayList<String>>();
536 541
		
537 542
			while (rows.hasNext()) {
538 543

  
539
				HSSFRow row = (HSSFRow) rows.next();
544
				Row row = rows.next();
540 545
				System.out.println("Row No.: " + row.getRowNum());
541
				Iterator cells = row.cellIterator();
546
				Iterator<Cell> cells = row.cellIterator();
542 547
				ArrayList<String> lstTerms = new ArrayList<String>();
543 548
				while (cells.hasNext()) {
544
					HSSFCell cell = (HSSFCell) cells.next();
549
					Cell cell = cells.next();
545 550
				
546 551
					int intCellType = cell.getCellType();
547 552
					switch (intCellType) {
......
651 656
		
652 657
	}
653 658
	
654
	private ArrayList<ArrayList<String>> loadSpreadsheet(String xslPathString) {
659
	private ArrayList<ArrayList<String>> loadSpreadsheet(String xslPathString) throws InvalidFormatException {
655 660
		ArrayList<ArrayList<String>> lstUpdates = new ArrayList<ArrayList<String>>();
656 661
		InputStream inputStream = null;
657 662
		
......
663 668
			e.printStackTrace();
664 669
		}
665 670
		
666
		POIFSFileSystem fileSystem = null;
667
		
668 671
		try {
669
			fileSystem = new POIFSFileSystem(inputStream);
672
//			POIFSFileSystem fileSystem = new POIFSFileSystem(inputStream);
673
//			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
674
			
675
			Workbook workBook = WorkbookFactory.create(inputStream);
670 676

  
671
			HSSFWorkbook workBook = new HSSFWorkbook(fileSystem);
672
			HSSFSheet sheet = workBook.getSheetAt(0);
673
			Iterator rows = sheet.rowIterator();
677
			
678
			Sheet sheet = workBook.getSheetAt(0);
679
			Iterator<Row> rows = sheet.rowIterator();
674 680
			// Iterator rows = sheet.rowIterator();
675 681
			//Set<Integer> lstTaxonIDs;
676 682
		
677 683

  
678 684
			while (rows.hasNext()) {
679 685

  
680
				HSSFRow row = (HSSFRow) rows.next();
686
				Row row = rows.next();
681 687
				System.out.println("Row No.: " + row.getRowNum());
682
				Iterator cells = row.cellIterator();
688
				Iterator<Cell> cells = row.cellIterator();
683 689
				ArrayList<String> lstTerms = new ArrayList<String>();
684 690
				while (cells.hasNext()) {
685
					HSSFCell cell = (HSSFCell) cells.next();
691
					Cell cell = cells.next();
686 692
				
687 693
					int intCellType = cell.getCellType();
688 694
					switch (intCellType) {
......
868 874
		//String xlsPath = "C://workspace//CDM Trunk//UseImport//src//main//java//eu//etaxonomy//cdm//toLoad2.xls";
869 875
		
870 876
		uiImport.setupNecessaryItems();
871
		uiImport.loadTerms();
872
		uiImport.loadUses();
877
		try {
878
			uiImport.loadTerms();
879
			uiImport.loadUses();
880
		} catch (InvalidFormatException e) {
881
			// TODO Auto-generated catch block
882
			e.printStackTrace();
883
		}
873 884
		//String xlsPath = "C://workspace//toLoad3.xls";
874 885
		//uiImport.importFromExcelSS(xlsPath);
875 886

  

Also available in: Unified diff