From: Nick Burch <nick@apache.org>
Date: Wed, 12 Jan 2011 17:22:40 +0000 (+0000)
Subject: HMEF dumping and properties tweaks
X-Git-Tag: REL_3_8_BETA1~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee734212a92dcff694cbc0e8b8d9fa5aa52119fe;p=poi.git

HMEF dumping and properties tweaks

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

diff --git a/src/scratchpad/src/org/apache/poi/hmef/MAPIAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/MAPIAttribute.java
index 81629e1db5..badf25ce71 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/MAPIAttribute.java
+++ b/src/scratchpad/src/org/apache/poi/hmef/MAPIAttribute.java
@@ -104,7 +104,8 @@ public class MAPIAttribute {
          MAPIProperty prop = MAPIProperty.get(id);
          if(id >= 0x8000 && id <= 0xFFFF) {
             // TODO
-            throw new UnsupportedOperationException("Not yet implemented for id " + id);
+            System.err.println("Not yet implemented for id " + id);
+            break;
          }
          
          // Now read in the value(s)
@@ -128,11 +129,10 @@ public class MAPIAttribute {
             
             // Data is always padded out to a 4 byte boundary
             if(len % 4 != 0) {
-               byte[] padding = new byte[len % 4];
+               byte[] padding = new byte[4 - (len % 4)];
                IOUtils.readFully(inp, padding);
             }
          }
-         break;
       }
       
       // All done
diff --git a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java b/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
index 133e9a6345..a64a558a17 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
+++ b/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
@@ -37,15 +37,24 @@ public final class HMEFDumper {
          throw new IllegalArgumentException("Filename must be given");
       }
       
-      for(String filename : args) {
+      boolean truncatePropData = true;
+      for(int i=0; i<args.length; i++) {
+         if(args[i].equalsIgnoreCase("--full")) {
+            truncatePropData = false;
+            continue;
+         }
+         
          HMEFDumper dumper = new HMEFDumper(
-               new FileInputStream(filename)
+               new FileInputStream(args[i])
          );
+         dumper.setTruncatePropertyData(truncatePropData);
          dumper.dump();
       }
    }
    
    private InputStream inp;
+   private boolean truncatePropertyData;
+   
    public HMEFDumper(InputStream inp) throws IOException {
       this.inp = inp;
       
@@ -63,6 +72,10 @@ public final class HMEFDumper {
       LittleEndian.readUShort(inp);
    }
    
+   public void setTruncatePropertyData(boolean truncate) {
+      truncatePropertyData = truncate;
+   }
+   
    private void dump() throws IOException {
       int level;
       
@@ -86,7 +99,11 @@ public final class HMEFDumper {
          String indent = "  ";
          System.out.println(indent + "Data of length " + attr.getData().length);
          if(attr.getData().length > 0) {
-            int len = Math.min( attr.getData().length, 48 );
+            int len = attr.getData().length;
+            if(truncatePropertyData) {
+               len = Math.min( attr.getData().length, 48 );
+            }
+            
             int loops = len/16;
             if(loops == 0) loops = 1;