From 999bac73e9f7525b99ecf4a0f0d0e239bcf985d1 Mon Sep 17 00:00:00 2001
From: Jukka Lauri Zitting <jukka@apache.org>
Date: Wed, 26 Mar 2008 19:06:41 +0000
Subject: [PATCH] TIKA-132: Refactor Excel extractor to parse per sheet and add
 hyperlink support     - Merged the two sid case statements to one

git-svn-id: https://svn.eu.apache.org/repos/asf/incubator/tika/trunk@641487 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tika/parser/microsoft/ExcelExtractor.java      | 42 ++++++++--------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java b/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
index 4d69cda..1cf1fde 100644
--- a/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
+++ b/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
@@ -265,50 +265,38 @@ public class ExcelExtractor {
                 //    }
                 //    break;
 
-                default:
-                    if (insideWorksheet
-                            && record instanceof CellValueRecordInterface) {
-                        CellValueRecordInterface value =
-                            (CellValueRecordInterface) record;
-                        addCell(record, getCellValue(record.getSid(), value));
-                    }
-                    break;
-            }
-        }
-
-        /**
-         * Process a Cell Value record.
-         *
-         * @param sid record type identifier
-         * @param record The cell value record
-         */
-        private Cell getCellValue(
-                short sid, CellValueRecordInterface record)
-                throws SAXException {
-            switch (sid) {
                 /* FormulaRecord: Cell value from a formula */
                 case FormulaRecord.sid:
-                    return new NumberCell(((FormulaRecord) record).getValue());
+                    FormulaRecord formula = (FormulaRecord) record;
+                    addCell(record, new NumberCell(formula.getValue()));
+                    break;
 
                 /* LabelRecord: strings stored directly in the cell */
                 case LabelRecord.sid:
-                    return getTextCell(((LabelRecord) record).getValue());
+                    LabelRecord label = (LabelRecord) record;
+                    addCell(record, getTextCell(label.getValue()));
+                    break;
 
                 /* LabelSSTRecord: Ref. a string in the shared string table */
                 case LabelSSTRecord.sid:
                     LabelSSTRecord labelSSTRecord = (LabelSSTRecord) record;
                     int sstIndex = labelSSTRecord.getSSTIndex();
-                    return getTextCell(sstRecord.getString(sstIndex).getString());
+                    String sstLabel = sstRecord.getString(sstIndex).getString();
+                    addCell(record, getTextCell(sstLabel));
+                    break;
 
                 /* NumberRecord: Contains a numeric cell value */
                 case NumberRecord.sid:
-                    return new NumberCell(((NumberRecord) record).getValue());
+                    NumberRecord number = (NumberRecord) record;
+                    addCell(record, new NumberCell(number.getValue()));
+                    break;
 
                 /* RKRecord: Excel internal number record */
                 case RKRecord.sid:
-                    return new NumberCell(((RKRecord)record).getRKNumber());
+                    RKRecord rk = (RKRecord) record;
+                    addCell(record, new NumberCell(rk.getRKNumber()));
+                    break;
             }
-            return null;
         }
 
         /**
-- 
2.11.4.GIT