embulk-parser-poi_excel 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac332670f656bcf9bbf5fe659b53a9a5d61ed34
-  data.tar.gz: b08187d453742b61242f3c0a414b859e7b3df605
+  metadata.gz: 0ce575511ee0ce2d0a9496f1d63013909d751504
+  data.tar.gz: f79c800fd6454ba5e2511e6e675a3465c3c2c7d3
 SHA512:
-  metadata.gz: d10568439d7728ce805c8a4945dce146b3c5b3983b1be2433b13986a07be0ac0cb52763daebe5c2cc0e0154403e3ec3a3fbbc57e1ff6112afb01a23157ad11da
-  data.tar.gz: e3b6f6efa059db9b8994ae78700cc8c50f67d80059b76eb41dafbc1b5ce26f1b133c1def929a7e4aa1d1f0fdaaff0d174683d2dba86956948276d2038275dd2e
+  metadata.gz: a4ddf5f3506c56924bbe9147c6b23e40f31853356b53e91215120ef9f930e322db50a60a9c2277bc51c863cf588610e44d18cf5ec401a0d8b31d0c7ff30f4b50
+  data.tar.gz: bf22e1256df159efd21cdf40d98ae014c8ddf1dc053848dce95a2635fa68dbac2d174833731f5ff700d814fc98a680ab666774b15cce49c24d7a94eea87d6ac1

data/README.md

@@ -20,7 +20,7 @@ in:
     skip_header_lines: 1	# first row is header.
     columns:
     - {name: row, type: long, value: row_number}
-    - {name: get_date, type: timestamp, value: cell_value, column_number: A}
+    - {name: get_date, type: timestamp, cell_column: A, value: cell_value}
     - {name: orb_type, type: string}
     - {name: orb_name, type: string}
     - {name: orb_shape, type: long}
@@ -28,13 +28,14 @@ in:
 ```
 
 if omit **value**, specified `cell_value`.  
-if omit **column_number** when **value** is `cell_value`, specified next column.  
+if omit **cell_column** when **value** is `cell_value`, specified next column.  
 
 
 ## Configuration
 
 * **sheets**: sheet name. can use wildcards `*`, `?`. (list of string, required)
-* **skip_header_lines**: skip rows. (integer, default: `0`)
+* **record_type**: record type.  (`row`, `column` or `sheet`. default: `row`)
+* **skip_header_lines**: skip rows when **record_type**=`row` (skip columns when **record_type**=`column`). ignored when **record_type**=`sheet`. (integer, default: `0`)
 * **columns**: column definition. see below. (hash, required)
 * **sheet_options**: sheet option. see below. (hash, default: null)
 
@@ -42,9 +43,11 @@ if omit **column_number** when **value** is `cell_value`, specified next column.
 
 * **name**: Embulk column name. (string, required)
 * **type**: Embulk column type. (string, required)
-* **value**: value type. see below. (string, defualt: `cell_value`)
-* **column_number**: Excel column number. see below. (string, default: next column)
-* **cell_address**: Excel cell address such as `A1`, `Sheet1!B3`. only one of `column_number`, `cell_address` can be specified. (string, not required)
+* **value**: value type. see below. (string, default: `cell_value`)
+* **column_number**: same as **cell_column**.
+* **cell_column**: Excel column number. see below. (string, default: next column when **record_type**=`row`)
+* **cell_row**: Excel row number. see below. (integer, default: next row when **record_type**=`column`)
+* **cell_address**: Excel cell address such as `A1`, `Sheet1!B3`. (string, not required)
 * **numeric_format**: format of numeric(double) to string such as `%4.2f`. (default: Java's Double.toString())
 * **attribute_name**: use with value `cell_style`, `cell_font`, etc. see below. (list of string)
 * **on_cell_error**: processing method of Cell error. see below. (string, default: `constant`)
@@ -71,7 +74,9 @@ if omit **column_number** when **value** is `cell_value`, specified next column.
   * `constant.`*value*: specified value.
   * `constant`: null.
 
-### column_number
+### cell_column
+
+Basically used for **record_type**=`row`.
 
 * `A`,`B`,`C`,...: column number of "A1 format".
 * *number*: column number (1 origin).
@@ -84,6 +89,12 @@ if omit **column_number** when **value** is `cell_value`, specified next column.
 * `=`: same column.
 * `=`*name*: same column of name.
 
+### cell_row
+
+Basically used for **record_type**=`column`.
+
+* *number*: row number (1 origin).
+
 ### attribute_name
 
 **value**が`cell_style`, `cell_font`, `cell_comment`のとき、デフォルトでは、全属性を取得してJSON文字列に変換します。  
@@ -91,7 +102,7 @@ if omit **column_number** when **value** is `cell_value`, specified next column.
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_style}
+    - {name: foo, type: string, cell_column: A, value: cell_style}
 ```
 
 
@@ -101,7 +112,7 @@ attribute_nameを指定することで、指定された属性だけを取得し
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_style, attribute_name: [border_top, border_bottom, border_left, border_right]}
+    - {name: foo, type: string, cell_column: A, value: cell_style, attribute_name: [border_top, border_bottom, border_left, border_right]}
 ```
 
 
@@ -114,8 +125,8 @@ attribute_nameを指定することで、指定された属性だけを取得し
     - {name: bar, type: long, value: cell_font.color}
 ```
 
-なお、`cell_style`や`cell_font`では、**column_number**を省略した場合は直前と同じ列を対象とします。  
-（`cell_value`では、**column_number**を省略すると次の列に移る）
+なお、`cell_style`や`cell_font`では、**cell_column**を省略した場合は直前と同じ列を対象とします。  
+（`cell_value`では、**cell_column**を省略すると次の列に移る）
 
 
 ### on_cell_error
@@ -124,7 +135,7 @@ Processing method of Cell error (`#DIV/0!`, `#REF!`, etc).
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_value, on_cell_error: error_code}
+    - {name: foo, type: string, cell_column: A, value: cell_value, on_cell_error: error_code}
 ```
 
 * `constant`: set null. (default)
@@ -139,7 +150,7 @@ Processing method of formula.
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_value, formula_handling: cashed_value}
+    - {name: foo, type: string, cell_column: A, value: cell_value, formula_handling: cashed_value}
 ```
 
 * `evaluate`: evaluate formula. (default)
@@ -152,11 +163,11 @@ Processing method of evaluate formula error.
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_value, on_evaluate_error: constant}
+    - {name: foo, type: string, cell_column: A, value: cell_value, on_evaluate_error: constant}
 ```
 
 * `constant`: set null.
-* `constant.`*value*: set value.
+* `constant.`*value*: set specified value.
 * `exception`: throw exception. (default)
 
 
@@ -166,10 +177,11 @@ Replace formula before evaluate.
 
 ```yaml
     columns:
-    - {name: foo, type: string, column_number: A, value: cell_value, formula_replace: [{regex: aaa, to: "A${row}"}, {regex: bbb, to: "B${row}"}]}
+    - {name: foo, type: string, cell_column: A, value: cell_value, formula_replace: [{regex: aaa, to: "A${row}"}, {regex: bbb, to: "B${row}"}]}
 ```
 
 `${row}` is replaced with the current row number.
+`${column}` is replaced with the current column string.
 
 
 ### on_convert_error
@@ -178,11 +190,11 @@ Processing method of convert error. ex) Excel boolean to Embulk timestamp
 
 ```yaml
     columns:
-    - {name: foo, type: timestamp, format: "%Y/%m/%d", column_number: A, value: cell_value, on_convert_error: constant.9999/12/31}
+    - {name: foo, type: timestamp, format: "%Y/%m/%d", cell_column: A, value: cell_value, on_convert_error: constant.9999/12/31}
 ```
 
 * `constant`: set null.
-* `constant.`*value*: set value.
+* `constant.`*value*: set specified value.
 * `exception`: throw exception. (default)
 
 
@@ -195,19 +207,19 @@ Options of individual sheet.
     type: poi_excel
     sheets: [Sheet1, Sheet2]
     columns:
-    - {name: date, type: timestamp, column_number: A}
+    - {name: date, type: timestamp, cell_column: A}
     - {name: foo, type: string}
     - {name: bar, type: long}
     sheet_options:
       Sheet1:
         skip_header_lines: 1
         columns:
-          foo: {column_number: B}
-          bar: {column_number: C}
+          foo: {cell_column: B}
+          bar: {cell_column: C}
       Sheet2:
         skip_header_lines: 0
         columns:
-          foo: {column_number: D}
+          foo: {cell_column: D}
           bar: {value: constant.0}
 ```
 

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.11"
+version = "0.1.12"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -57,6 +57,12 @@ task "package"(dependsOn: ["gemspec", "classpath"]) {
     }
 }
 
+task gemUnpack(type: JRubyExec) {
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "unpack", "pkg/${project.name}-${project.version}.gem"
+}
+
 task gemspec {
     ext.gemspecFile = file("${project.name}.gemspec")
     inputs.file "build.gradle"

data/src/main/java/org/embulk/parser/poi_excel/PoiExcelColumnValueType.java

@@ -1,5 +1,7 @@
 package org.embulk.parser.poi_excel;
 
+import org.embulk.parser.poi_excel.bean.record.RecordType;
+
 public enum PoiExcelColumnValueType {
 	/** cell value */
 	CELL_VALUE(true, true),
@@ -18,9 +20,25 @@ public enum PoiExcelColumnValueType {
 	/** sheet name */
 	SHEET_NAME(false, false),
 	/** row number (1 origin) */
-	ROW_NUMBER(false, false),
+	ROW_NUMBER(false, false) {
+		@Override
+		public boolean useCell(RecordType recordType) {
+			if (recordType == RecordType.COLUMN) {
+				return true;
+			}
+			return super.useCell(recordType);
+		}
+	},
 	/** column number (1 origin) */
-	COLUMN_NUMBER(true, false),
+	COLUMN_NUMBER(true, false) {
+		@Override
+		public boolean useCell(RecordType recordType) {
+			if (recordType == RecordType.ROW) {
+				return true;
+			}
+			return super.useCell(recordType);
+		}
+	},
 	/** constant */
 	CONSTANT(false, false);
 
@@ -32,7 +50,7 @@ public enum PoiExcelColumnValueType {
 		this.nextIndex = nextIndex;
 	}
 
-	public boolean useCell() {
+	public boolean useCell(RecordType recordType) {
 		return useCell;
 	}
 

data/src/main/java/org/embulk/parser/poi_excel/PoiExcelParserPlugin.java

@@ -10,7 +10,6 @@ import java.util.regex.Pattern;
 
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -20,6 +19,8 @@ import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
+import org.embulk.parser.poi_excel.bean.PoiExcelSheetBean;
+import org.embulk.parser.poi_excel.bean.record.PoiExcelRecord;
 import org.embulk.parser.poi_excel.visitor.PoiExcelColumnVisitor;
 import org.embulk.parser.poi_excel.visitor.PoiExcelVisitorFactory;
 import org.embulk.parser.poi_excel.visitor.PoiExcelVisitorValue;
@@ -69,6 +70,10 @@ public class PoiExcelParserPlugin implements ParserPlugin {
 
 	public interface SheetCommonOptionTask extends Task, ColumnCommonOptionTask {
 
+		@Config("record_type")
+		@ConfigDefault("null")
+		public Optional<String> getRecordType();
+
 		@Config("skip_header_lines")
 		@ConfigDefault("null")
 		public Optional<Integer> getSkipHeaderLines();
@@ -91,11 +96,25 @@ public class PoiExcelParserPlugin implements ParserPlugin {
 		@ConfigDefault("null")
 		public Optional<String> getValueType();
 
-		// A,B,... or number(1 origin)
+		// same as cell_column
 		@Config("column_number")
 		@ConfigDefault("null")
 		public Optional<String> getColumnNumber();
 
+		public static final String CELL_COLUMN = "cell_column";
+
+		// A,B,... or number(1 origin)
+		@Config(CELL_COLUMN)
+		@ConfigDefault("null")
+		public Optional<String> getCellColumn();
+
+		public static final String CELL_ROW = "cell_row";
+
+		// number(1 origin)
+		@Config(CELL_ROW)
+		@ConfigDefault("null")
+		public Optional<String> getCellRow();
+
 		// A1,B2,... or Sheet1!A1
 		@Config("cell_address")
 		@ConfigDefault("null")
@@ -256,21 +275,18 @@ public class PoiExcelParserPlugin implements ParserPlugin {
 				log.info("sheet={}", sheetName);
 				PoiExcelVisitorFactory factory = newPoiExcelVisitorFactory(task, schema, sheet, pageBuilder);
 				PoiExcelColumnVisitor visitor = factory.getPoiExcelColumnVisitor();
-				final int skipHeaderLines = factory.getVisitorValue().getSheetBean().getSkipHeaderLines();
+				PoiExcelSheetBean sheetBean = factory.getVisitorValue().getSheetBean();
+				final int skipHeaderLines = sheetBean.getSkipHeaderLines();
+
+				PoiExcelRecord record = sheetBean.getRecordType().newPoiExcelRecord();
+				record.initialize(sheet, skipHeaderLines);
+				visitor.setRecord(record);
 
 				int count = 0;
-				for (Row row : sheet) {
-					int rowIndex = row.getRowNum();
-					if (rowIndex < skipHeaderLines) {
-						log.debug("row({}) skipped", rowIndex);
-						continue;
-					}
-					if (log.isDebugEnabled()) {
-						log.debug("row({}) start", rowIndex);
-					}
+				for (; record.exists(); record.moveNext()) {
+					record.logStart();
 
-					visitor.setRow(row);
-					schema.visitColumns(visitor);
+					schema.visitColumns(visitor); // use record
 					pageBuilder.addRecord();
 
 					if (++count >= flushCount) {
@@ -279,9 +295,7 @@ public class PoiExcelParserPlugin implements ParserPlugin {
 						count = 0;
 					}
 
-					if (log.isDebugEnabled()) {
-						log.debug("row({}) end", rowIndex);
-					}
+					record.logEnd();
 				}
 				pageBuilder.flush();
 			}

data/src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnBean.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.poi.ss.util.CellReference;
 import org.embulk.config.ConfigException;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.ColumnCommonOptionTask;
@@ -101,6 +102,12 @@ public class PoiExcelColumnBean {
 	}
 
 	public Optional<String> getColumnNumber() {
+		for (ColumnOptionTask task : columnTaskList) {
+			Optional<String> option = task.getCellColumn();
+			if (option.isPresent()) {
+				return option;
+			}
+		}
 		for (ColumnOptionTask task : columnTaskList) {
 			Optional<String> option = task.getColumnNumber();
 			if (option.isPresent()) {
@@ -110,6 +117,16 @@ public class PoiExcelColumnBean {
 		return Optional.absent();
 	}
 
+	public Optional<String> getRowNumber() {
+		for (ColumnOptionTask task : columnTaskList) {
+			Optional<String> option = task.getCellRow();
+			if (option.isPresent()) {
+				return option;
+			}
+		}
+		return Optional.absent();
+	}
+
 	private Optional<PoiExcelCellAddress> cellAddress;
 
 	public PoiExcelCellAddress getCellAddress() {
@@ -123,12 +140,17 @@ public class PoiExcelColumnBean {
 		for (ColumnOptionTask task : columnTaskList) {
 			Optional<String> option = task.getCellAddress();
 			if (option.isPresent()) {
-				return Optional.of(new PoiExcelCellAddress(option.get()));
+				CellReference ref = new CellReference(option.get());
+				return Optional.of(new PoiExcelCellAddress(ref));
 			}
 		}
 		return Optional.absent();
 	}
 
+	public void setCellAddress(CellReference ref) {
+		this.cellAddress = Optional.of(new PoiExcelCellAddress(ref));
+	}
+
 	protected abstract class CacheValue<T> {
 		private T value;
 

data/src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnIndex.java

@@ -7,7 +7,9 @@ import java.util.Map;
 
 import org.apache.poi.ss.util.CellReference;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
+import org.embulk.parser.poi_excel.PoiExcelParserPlugin.ColumnOptionTask;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.PluginTask;
+import org.embulk.parser.poi_excel.bean.record.RecordType;
 import org.embulk.parser.poi_excel.bean.util.PoiExcelCellAddress;
 import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
@@ -19,18 +21,26 @@ import com.google.common.base.Optional;
 public class PoiExcelColumnIndex {
 	private final Logger log = Exec.getLogger(getClass());
 
+	protected final RecordType recordType;
 	protected final Map<String, Integer> indexMap = new LinkedHashMap<>();
 
+	public PoiExcelColumnIndex(PoiExcelSheetBean sheetBean) {
+		this.recordType = sheetBean.getRecordType();
+	}
+
 	public void initializeColumnIndex(PluginTask task, List<PoiExcelColumnBean> beanList) {
+		log.info("record_type={}", recordType);
+
 		int index = -1;
 		indexMap.clear();
 
 		Schema schema = task.getColumns().toSchema();
 		for (Column column : schema.getColumns()) {
 			PoiExcelColumnBean bean = beanList.get(column.getIndex());
-			PoiExcelColumnValueType valueType = bean.getValueType();
+			initializeCellAddress(column, bean);
 
-			if (valueType.useCell()) {
+			PoiExcelColumnValueType valueType = bean.getValueType();
+			if (valueType.useCell(recordType)) {
 				index = resolveColumnIndex(column, bean, index, valueType);
 				if (index < 0) {
 					index = 0;
@@ -39,21 +49,74 @@ public class PoiExcelColumnIndex {
 				indexMap.put(column.getName(), index);
 			}
 
+			initializeCellAddress2(column, bean, index);
+
 			if (log.isInfoEnabled()) {
 				logColumn(column, bean, valueType, index);
 			}
 		}
 	}
 
+	protected void initializeCellAddress(Column column, PoiExcelColumnBean bean) {
+		if (bean.getCellAddress() != null) {
+			return;
+		}
+
+		Optional<String> rowOption = bean.getRowNumber();
+		Optional<String> colOption = bean.getColumnNumber();
+		if (rowOption.isPresent() && colOption.isPresent()) {
+			String rowNumber = rowOption.get();
+			String colNumber = colOption.get();
+			initializeCellAddress(column, bean, rowNumber, colNumber);
+			return;
+		}
+
+		if (recordType == RecordType.SHEET) {
+			String rowNumber = rowOption.or("1");
+			String colNumber = colOption.or("A");
+			initializeCellAddress(column, bean, rowNumber, colNumber);
+			return;
+		}
+	}
+
+	protected void initializeCellAddress(Column column, PoiExcelColumnBean bean, String rowNumber, String columnNumber) {
+		int columnIndex = convertColumnIndex(column, OPTION_NAME_CELL_COLUMN, columnNumber);
+		int rowIndex = convertColumnIndex(column, OPTION_NAME_CELL_ROW, rowNumber);
+		CellReference ref = new CellReference(rowIndex, columnIndex);
+		bean.setCellAddress(ref);
+	}
+
+	protected void initializeCellAddress2(Column column, PoiExcelColumnBean bean, int index) {
+		if (bean.getCellAddress() != null) {
+			return;
+		}
+
+		Optional<String> recordOption = recordType.getRecordOption(bean);
+		if (recordOption.isPresent()) {
+			int rowIndex, columnIndex;
+			switch (recordType) {
+			case ROW:
+				rowIndex = convertColumnIndex(column, recordType.getRecordOptionName(), recordOption.get());
+				columnIndex = (index >= 0) ? index : 0;
+				break;
+			case COLUMN:
+				rowIndex = (index >= 0) ? index : 0;
+				columnIndex = convertColumnIndex(column, recordType.getRecordOptionName(), recordOption.get());
+				break;
+			default:
+				throw new IllegalStateException();
+			}
+			CellReference ref = new CellReference(rowIndex, columnIndex);
+			bean.setCellAddress(ref);
+		}
+	}
+
 	protected int resolveColumnIndex(Column column, PoiExcelColumnBean bean, int index,
 			PoiExcelColumnValueType valueType) {
-		Optional<String> numberOption = bean.getColumnNumber();
+		Optional<String> numberOption = recordType.getNumberOption(bean);
 		PoiExcelCellAddress cellAddress = bean.getCellAddress();
 
 		if (cellAddress != null) {
-			if (numberOption.isPresent()) {
-				throw new RuntimeException("only one of column_number, cell_address can be specified");
-			}
 			return index;
 		}
 
@@ -73,7 +136,7 @@ public class PoiExcelColumnIndex {
 					break;
 				}
 			}
-			return convertColumnIndex(column, columnNumber);
+			return convertColumnIndex(column, recordType.getNumberOptionName(), columnNumber);
 		} else {
 			if (valueType.nextIndex()) {
 				index++;
@@ -144,11 +207,12 @@ public class PoiExcelColumnIndex {
 
 	protected void checkIndex(Column column, int index) {
 		if (index < 0) {
-			throw new RuntimeException(MessageFormat.format("column_number out of range at {0}", column));
+			throw new RuntimeException(MessageFormat.format("{0} out of range at {1}",
+					recordType.getNumberOptionName(), column));
 		}
 	}
 
-	protected int convertColumnIndex(Column column, String columnNumber) {
+	protected int convertColumnIndex(Column column, String numberOptionName, String columnNumber) {
 		int index;
 		try {
 			char c = columnNumber.charAt(0);
@@ -158,16 +222,19 @@ public class PoiExcelColumnIndex {
 				index = CellReference.convertColStringToIndex(columnNumber);
 			}
 		} catch (Exception e) {
-			throw new RuntimeException(MessageFormat.format("illegal column_number=\"{0}\" at {1}", columnNumber,
-					column), e);
+			throw new RuntimeException(MessageFormat.format("illegal {0}=\"{1}\" at {2}", numberOptionName,
+					columnNumber, column), e);
 		}
 		if (index < 0) {
-			throw new RuntimeException(MessageFormat.format("illegal column_number=\"{0}\" at {1}", columnNumber,
-					column));
+			throw new RuntimeException(MessageFormat.format("illegal {0}=\"{1}\" at {2}", numberOptionName,
+					columnNumber, column));
 		}
 		return index;
 	}
 
+	private static final String OPTION_NAME_CELL_COLUMN = ColumnOptionTask.CELL_COLUMN;
+	private static final String OPTION_NAME_CELL_ROW = ColumnOptionTask.CELL_ROW;
+
 	protected void logColumn(Column column, PoiExcelColumnBean bean, PoiExcelColumnValueType valueType, int index) {
 		PoiExcelCellAddress cellAddress = bean.getCellAddress();
 
@@ -176,8 +243,20 @@ public class PoiExcelColumnIndex {
 			cname = "cell_address";
 			cvalue = cellAddress.getString();
 		} else {
-			cname = "cell_column";
-			cvalue = CellReference.convertNumToColString(index);
+			switch (recordType) {
+			default:
+				cname = OPTION_NAME_CELL_COLUMN;
+				cvalue = CellReference.convertNumToColString(index);
+				break;
+			case COLUMN:
+				cname = OPTION_NAME_CELL_ROW;
+				cvalue = Integer.toString(index + 1);
+				break;
+			case SHEET:
+				cname = "sheet";
+				cvalue = null;
+				break;
+			}
 		}
 
 		switch (valueType) {
@@ -186,43 +265,47 @@ public class PoiExcelColumnIndex {
 		case CELL_FORMULA:
 		case CELL_TYPE:
 		case CELL_CACHED_TYPE:
-		case COLUMN_NUMBER:
-			log.info("column.name={} <- {}={}, value_type={}", column.getName(), cname, cvalue, valueType);
+			log.info("column.name={} <- {}={}, value={}", column.getName(), cname, cvalue, valueType);
 			break;
 		case CELL_STYLE:
 		case CELL_FONT:
 		case CELL_COMMENT:
 			String suffix = bean.getValueTypeSuffix();
 			if (suffix != null) {
-				log.info("column.name={} <- {}={}, value_type={}, value=[{}]", column.getName(), cname, cvalue,
-						valueType, suffix);
+				log.info("column.name={} <- {}={}, value={}[{}]", column.getName(), cname, cvalue, valueType, suffix);
 			} else {
-				log.info("column.name={} <- {}={}, value_type={}, value={}", column.getName(), cname, cvalue,
-						valueType, suffix);
+				log.info("column.name={} <- {}={}, value={}", column.getName(), cname, cvalue, valueType);
 			}
 			break;
 
 		case SHEET_NAME:
 			if (cellAddress != null && cellAddress.getSheetName() != null) {
-				log.info("column.name={} <- {}={}, value_type={}", column.getName(), cname, cvalue, valueType);
+				log.info("column.name={} <- {}={}, value={}", column.getName(), cname, cvalue, valueType);
 			} else {
-				log.info("column.name={} <- value_type={}", column.getName(), valueType);
+				log.info("column.name={} <- value={}", column.getName(), valueType);
 			}
 			break;
 		case ROW_NUMBER:
-			if (cellAddress != null) {
-				log.info("column.name={} <- {}={}, value_type={}", column.getName(), cname, cvalue, valueType);
+			if (cellAddress != null || cname.equals(OPTION_NAME_CELL_ROW)) {
+				log.info("column.name={} <- {}={}, value={}", column.getName(), cname, cvalue, valueType);
+			} else {
+				log.info("column.name={} <- value={}", column.getName(), valueType);
+			}
+			break;
+		case COLUMN_NUMBER:
+			if (cellAddress != null || cname.equals(OPTION_NAME_CELL_COLUMN)) {
+				log.info("column.name={} <- {}={}, value={}", column.getName(), cname, cvalue, valueType);
 			} else {
-				log.info("column.name={} <- value_type={}", column.getName(), valueType);
+				log.info("column.name={} <- value={}", column.getName(), valueType);
 			}
 			break;
 
 		case CONSTANT:
 			String value = bean.getValueTypeSuffix();
 			if (value != null) {
-				log.info("column.name={} <- value_type={}, value=[{}]", column.getName(), valueType, value);
+				log.info("column.name={} <- value={}[{}]", column.getName(), valueType, value);
 			} else {
-				log.info("column.name={} <- value_type={}, value={}", column.getName(), valueType, value);
+				log.info("column.name={} <- value={}({})", column.getName(), valueType, value);
 			}
 			break;
 		}