Revision 52643
Added by Miriam Baglioni almost 6 years ago
| modules/dnet-collector-plugins/trunk/src/main/java/eu/dnetlib/data/collector/plugins/excel/Read.java | ||
|---|---|---|
| 173 | 173 |
int count = 0; |
| 174 | 174 |
while (cellIterator.hasNext()){
|
| 175 | 175 |
cell = cellIterator.next(); |
| 176 |
project += applyReplace(cell.getStringCellValue(),map_header) + ";"; |
|
| 177 |
if(count++ == column_id) identifier = applyReplace(cell.getStringCellValue(),map_header); |
|
| 176 |
final String stringCellValue = cell.getStringCellValue(); |
|
| 177 |
project += applyReplace(stringCellValue,map_header) + ";"; |
|
| 178 |
if(count++ == column_id) identifier = applyReplace(stringCellValue,map_header); |
|
| 178 | 179 |
} |
| 179 | 180 |
project = project.substring(0, project.length() -1 ); |
| 180 | 181 |
csv_writer.setHeader(project.split(";"));
|
| ... | ... | |
| 188 | 189 |
Iterator<Cell>cellIterator; |
| 189 | 190 |
for(int row_number = header_row + 1; row_number < sheet.getLastRowNum(); row_number++){
|
| 190 | 191 |
row = sheet.getRow(row_number); |
| 191 |
cellIterator = row.cellIterator();
|
|
| 192 |
int col_number = 0;
|
|
| 192 |
if (row != null) {
|
|
| 193 |
cellIterator = row.cellIterator();
|
|
| 193 | 194 |
|
| 194 |
boolean discard_row = false; |
|
| 195 |
ArrayList<String> al = new ArrayList<String>(); |
|
| 196 |
while(cellIterator.hasNext() && !discard_row){
|
|
| 197 |
cell = cellIterator.next(); |
|
| 198 |
tmp = getCellValue(cell).trim(); |
|
| 199 |
if (col_number == column_id && |
|
| 200 |
((remove_empty && tmp.trim().equals("")) ||
|
|
| 201 |
(!remove_id.equals("") && tmp.equals(remove_id))))
|
|
| 202 |
discard_row = true; |
|
| 195 |
int col_number = 0; |
|
| 203 | 196 |
|
| 204 |
if (replace_currency && col_number == currency_column) |
|
| 205 |
tmp = tmp.replace(from_currency,to_currency); |
|
| 197 |
boolean discard_row = false; |
|
| 198 |
ArrayList<String> al = new ArrayList<String>(); |
|
| 199 |
while (cellIterator.hasNext() && !discard_row) {
|
|
| 200 |
cell = cellIterator.next(); |
|
| 201 |
tmp = getCellValue(cell).trim(); |
|
| 202 |
if (col_number == column_id && |
|
| 203 |
((remove_empty && tmp.trim().equals("")) ||
|
|
| 204 |
(!remove_id.equals("") && tmp.equals(remove_id))))
|
|
| 205 |
discard_row = true; |
|
| 206 | 206 |
|
| 207 |
al.add(applyReplace(tmp,map_body)); |
|
| 208 |
col_number ++; |
|
| 209 |
} |
|
| 210 |
if(!discard_row){
|
|
| 211 |
csv_writer.addProject(al); |
|
| 207 |
if (replace_currency && col_number == currency_column) |
|
| 208 |
tmp = tmp.replace(from_currency, to_currency); |
|
| 212 | 209 |
|
| 210 |
al.add(applyReplace(tmp, map_body)); |
|
| 211 |
col_number++; |
|
| 212 |
} |
|
| 213 |
if (!discard_row) {
|
|
| 214 |
csv_writer.addProject(al); |
|
| 215 |
|
|
| 216 |
} |
|
| 213 | 217 |
} |
| 214 | 218 |
} |
| 215 | 219 |
|
Also available in: Unified diff
fix issue in input data