You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/11/30 17:40:54 UTC
svn commit: r1642563 - in /poi/trunk/src:
java/org/apache/poi/hssf/extractor/ java/org/apache/poi/hssf/record/
testcases/org/apache/poi/hssf/extractor/
Author: nick
Date: Sun Nov 30 16:40:53 2014
New Revision: 1642563
URL: http://svn.apache.org/r1642563
Log:
On Biff5 files, include the sheet name. (Older formats are single sheet)
Added:
poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java?rev=1642563&r1=1642562&r2=1642563&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java Sun Nov 30 16:40:53 2014
@@ -30,6 +30,7 @@ import org.apache.poi.hssf.record.Formul
import org.apache.poi.hssf.record.NumberRecord;
import org.apache.poi.hssf.record.OldFormulaRecord;
import org.apache.poi.hssf.record.OldLabelRecord;
+import org.apache.poi.hssf.record.OldSheetRecord;
import org.apache.poi.hssf.record.OldStringRecord;
import org.apache.poi.hssf.record.RKRecord;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -140,6 +141,15 @@ public class OldExcelExtractor {
ris.nextRecord();
switch (sid) {
+ // Biff 5+ only, no sheet names in older formats
+ case OldSheetRecord.sid:
+ OldSheetRecord shr = new OldSheetRecord(ris);
+ shr.setCodePage(codepage);
+ text.append("Sheet: ");
+ text.append(shr.getSheetname());
+ text.append('\n');
+ break;
+
// label - 5.63 - TODO Needs codepages
case OldLabelRecord.biff2_sid:
case OldLabelRecord.biff345_sid:
Added: poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java?rev=1642563&view=auto
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java (added)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/OldSheetRecord.java Sun Nov 30 16:40:53 2014
@@ -0,0 +1,82 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record;
+
+import org.apache.poi.util.HexDump;
+
+/**
+ * Title: Bound Sheet Record (aka BundleSheet) (0x0085) for BIFF 5<P>
+ * Description: Defines a sheet within a workbook. Basically stores the sheet name
+ * and tells where the Beginning of file record is within the HSSF
+ * file.
+ */
+public final class OldSheetRecord {
+ public final static short sid = 0x0085;
+
+ private int field_1_position_of_BOF;
+ private int field_2_visibility;
+ private int field_3_type;
+ private byte[] field_5_sheetname;
+ private CodepageRecord codepage;
+
+ public OldSheetRecord(RecordInputStream in) {
+ field_1_position_of_BOF = in.readInt();
+ field_2_visibility = in.readUByte();
+ field_3_type = in.readUByte();
+ int field_4_sheetname_length = in.readUByte();
+ field_5_sheetname = new byte[field_4_sheetname_length];
+ in.read(field_5_sheetname, 0, field_4_sheetname_length);
+ }
+
+ public void setCodePage(CodepageRecord codepage) {
+ this.codepage = codepage;
+ }
+
+ public short getSid() {
+ return sid;
+ }
+
+ /**
+ * get the offset in bytes of the Beginning of File Marker within the HSSF Stream part of the POIFS file
+ *
+ * @return offset in bytes
+ */
+ public int getPositionOfBof() {
+ return field_1_position_of_BOF;
+ }
+
+ /**
+ * get the sheetname for this sheet. (this appears in the tabs at the bottom)
+ * @return sheetname the name of the sheet
+ */
+ public String getSheetname() {
+ return OldStringRecord.getString(field_5_sheetname, codepage);
+ }
+
+ public String toString() {
+ StringBuffer buffer = new StringBuffer();
+
+ buffer.append("[BOUNDSHEET]\n");
+ buffer.append(" .bof = ").append(HexDump.intToHex(getPositionOfBof())).append("\n");
+ buffer.append(" .visibility = ").append(HexDump.shortToHex(field_2_visibility)).append("\n");
+ buffer.append(" .type = ").append(HexDump.byteToHex(field_3_type)).append("\n");
+ buffer.append(" .sheetname = ").append(getSheetname()).append("\n");
+ buffer.append("[/BOUNDSHEET]\n");
+ return buffer.toString();
+ }
+}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java?rev=1642563&r1=1642562&r2=1642563&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/OldStringRecord.java Sun Nov 30 16:40:53 2014
@@ -80,8 +80,7 @@ public final class OldStringRecord {
try {
return CodePageUtil.getStringFromCodePage(data, cp);
} catch (UnsupportedEncodingException uee) {
- // Hope the system default is ok...
- return new String(data);
+ throw new IllegalArgumentException("Unsupported codepage requested", uee);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java?rev=1642563&r1=1642562&r2=1642563&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java Sun Nov 30 16:40:53 2014
@@ -66,6 +66,9 @@ public final class TestOldExcelExtractor
// Check we find a few numbers we expect in there
assertContains(text, "15");
assertContains(text, "169");
+
+ // Check we got the sheet names (new formats only)
+ assertContains(text, "Sheet: Feuil3");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org