working on a new object model

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352745 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
index e7b60a4517eb3f886916bb234ce9ac89b3446fc0..a12195475267ebb7a5831962da9a538ab4a76f75 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
@@ -280,7 +280,7 @@ public class HDFObjectFactory
         //initCharacterProperties();
         //initParagraphProperties();
     }
-    private void initCharacterProperties(int charOffset, PlexOfCps charPlcf, int end)
+    private void initCharacterProperties(int charOffset, PlexOfCps charPlcf, int start, int end)
     {
         //Initialize paragraph property stuff
         //int currentCharPage = _charParsingState.getCurrentPage();
@@ -301,7 +301,8 @@ public class HDFObjectFactory
             charStart = fkp.getStart(currentChpxIndex);
             charEnd = fkp.getEnd(currentChpxIndex);
             byte[] chpx = fkp.getGrpprl(currentChpxIndex);
-            _listener.characterRun(new ChpxNode(charStart, charEnd, chpx));
+            _listener.characterRun(new ChpxNode(Math.max(charStart, start),  Math.min(charEnd, end), chpx));
+
             if (charEnd < end)
             {
               currentChpxIndex++;
@@ -324,7 +325,7 @@ public class HDFObjectFactory
         }
         while(currentPageIndex < charPlcfLen);
     }
-    private void initParagraphProperties(int parOffset, PlexOfCps parPlcf, int charOffset, PlexOfCps charPlcf, int end)
+    private void initParagraphProperties(int parOffset, PlexOfCps parPlcf, int charOffset, PlexOfCps charPlcf, int start, int end)
     {
         //Initialize paragraph property stuff
         //int currentParPage = _parParsingState.getCurrentPage();
@@ -341,8 +342,8 @@ public class HDFObjectFactory
             int parStart = fkp.getStart(currentPapxIndex);
             int parEnd = fkp.getEnd(currentPapxIndex);
             byte[] papx = fkp.getGrpprl(currentPapxIndex);
-            _listener.paragraph(new PapxNode(parStart, parEnd, papx));
-            initCharacterProperties(charOffset, charPlcf, end);
+            _listener.paragraph(new PapxNode(Math.max(parStart, start), Math.min(parEnd, end), papx));
+            initCharacterProperties(charOffset, charPlcf, Math.max(start, parStart), Math.min(parEnd, end));
             if (parEnd < end)
             {
               currentPapxIndex++;
@@ -523,6 +524,8 @@ public class HDFObjectFactory
     private void initSectionProperties()
     {
 
+      int ccpText = _fib.getCcpText();
+      int ccpFtn = _fib.getCcpFtn();
 
       //sections
       int fcMin = _fib.getFcMin();
@@ -548,21 +551,50 @@ public class HDFObjectFactory
       PlexOfCps plcfsed = new PlexOfCps(plcfsedSize, 12);
       int arraySize = plcfsed.length();
 
+      int start = fcMin;
+      int end = fcMin + ccpText;
+      int x = 0;
+      int sectionEnd = 0;
+
+      //do the main body sections
+      while (x < arraySize)
+      {
+          int sectionStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x)) + fcMin;
+          sectionEnd = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x + 1)) + fcMin;
+          int sepxStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getStructOffset(x) + 2);
+          int sepxSize = LittleEndian.getShort(_mainDocument, sepxStart);
+
+          byte[] sepx = new byte[sepxSize];
+          System.arraycopy(_mainDocument, sepxStart + 2, sepx, 0, sepxSize);
+          SepxNode node = new SepxNode(x + 1, sectionStart, sectionEnd, sepx);
+          _listener.bodySection(node);
+          initParagraphProperties(parOffset, parPlcf, charOffset, charPlcf, sectionStart, Math.min(end, sectionEnd));
 
-      for(int x = 0; x < arraySize; x++)
+          if (sectionEnd > end)
+          {
+            break;
+          }
+          else
+          {
+            x++;
+          }
+      }
+      //do the header sections
+      for (; x < arraySize; x++)// && sectionEnd <= end; x++)
       {
           int sectionStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x)) + fcMin;
-          int sectionEnd = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x + 1)) + fcMin;
+          sectionEnd = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getIntOffset(x + 1)) + fcMin;
           int sepxStart = LittleEndian.getInt(_tableBuffer, plcfsedFC + plcfsed.getStructOffset(x) + 2);
           int sepxSize = LittleEndian.getShort(_mainDocument, sepxStart);
 
           byte[] sepx = new byte[sepxSize];
           System.arraycopy(_mainDocument, sepxStart + 2, sepx, 0, sepxSize);
           SepxNode node = new SepxNode(x + 1, sectionStart, sectionEnd, sepx);
-          _listener.section(node);
+          _listener.hdrSection(node);
+          initParagraphProperties(parOffset, parPlcf, charOffset, charPlcf, Math.max(sectionStart, end), sectionEnd);
 
-          initParagraphProperties(parOffset, parPlcf, charOffset, charPlcf, sectionEnd);
       }
+      _listener.endSections();
     }
     /**
      * Initializes the DocumentProperties object unique to this document.

diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
index dc1ad63c53d884f47cf72ed01848a2fa679cd64d..46f39d0023676615989094b45e1760e2f29e9e2d 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
@@ -16,6 +16,9 @@ import org.apache.poi.hdf.model.hdftypes.StyleSheet;
 public class HDFObjectModel implements HDFLowLevelParsingListener
 {
 
+    /** "WordDocument" from the POIFS */
+    private byte[] _mainDocument;
+
     /** The DOP*/
     private DocumentProperties _dop;
     /**the StyleSheet*/
@@ -25,6 +28,9 @@ public class HDFObjectModel implements HDFLowLevelParsingListener
     /** Font info */
     private FontTable _fonts;
 
+    /** text offset in main stream */
+    int _fcMin;
+
     /** text pieces */
     BTreeSet _text = new BTreeSet();
     /** document sections */
@@ -37,15 +43,32 @@ public class HDFObjectModel implements HDFLowLevelParsingListener
     public HDFObjectModel()
     {
     }
-
+    public void mainDocument(byte[] mainDocument)
+    {
+      _mainDocument = mainDocument;
+    }
+    public void tableStream(byte[] tableStream)
+    {
+    }
+    public void miscellaneous(int fcMin, int ccpText, int ccpFtn, int fcPlcfhdd, int lcbPlcfhdd)
+    {
+      _fcMin = fcMin;
+    }
     public void document(DocumentProperties dop)
     {
       _dop = dop;
     }
-    public void section(SepxNode sepx)
+    public void bodySection(SepxNode sepx)
     {
       _sections.add(sepx);
     }
+    public void hdrSection(SepxNode sepx)
+    {
+      _sections.add(sepx);
+    }
+    public void endSections()
+    {
+    }
     public void paragraph(PapxNode papx)
     {
       _paragraphs.add(papx);