*) adding httpContentLengthInputStream.java class to allow reading of http response bodies

until EOF even if a persistent connection is used
*) httpdByteCountInputStream.java: adding skip method
*) httpHeader.java: adding getCharacterEncoding function

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2616 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/http/httpContentLengthInputStream.java

@@ -0,0 +1,107 @@
+//httpContentLengthInputStream.java 
+//-----------------------
+//(C) by Michael Peter Christen; mc@anomic.de
+//first published on http://www.anomic.de
+//Frankfurt, Germany, 2004
+//
+// This file is contributed by Martin Thelian
+//
+// $LastChangedDate: 2006-09-15 17:01:25 +0200 (Fr, 15 Sep 2006) $
+// $LastChangedRevision: 2598 $
+// $LastChangedBy: theli $
+//
+//This program is free software; you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation; either version 2 of the License, or
+//(at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+//
+//You should have received a copy of the GNU General Public License
+//along with this program; if not, write to the Free Software
+//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//Using this software in any meaning (reading, learning, copying, compiling,
+//running) means that you agree that the Author(s) is (are) not responsible
+//for cost, loss of data or any harm that may be caused directly or indirectly
+//by usage of this softare or this documentation. The usage of this software
+//is on your own risk. The installation and usage (starting/running) of this
+//software may allow other people or application to access your computer and
+//any attached devices and is highly dependent on the configuration of the
+//software which must be done by the user of the software; the author(s) is
+//(are) also not responsible for proper configuration and usage of the
+//software, even if provoked by documentation provided together with
+//the software.
+//
+//Any changes to this file according to the GPL as documented in the file
+//gpl.txt aside this file in the shipment you received can be done to the
+//lines that follows this copyright notice here, but changes must not be
+//done inside the copyright notive above. A re-distribution must contain
+//the intact and unchanged copyright notice.
+//Contributions and changes to the program code must be marked as such.
+
+package de.anomic.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class httpContentLengthInputStream extends httpdByteCountInputStream {
+
+    private long contentLength;
+    private boolean closed = false;
+    
+    public httpContentLengthInputStream(InputStream inputStream, long contentLength) {
+        super(inputStream);
+        this.contentLength = contentLength;
+    }
+    
+    public long getContentLength() {
+        return this.contentLength;
+    }
+    
+    public boolean isClosed() {
+        return this.closed;
+    }
+    
+    public void close() throws IOException {
+        if (!this.closed) {
+            this.closed = true;
+            super.close();            
+        }
+    }
+    
+    public int read() throws IOException {
+        if (this.closed) throw new IOException("Stream already closed.");        
+        
+        // if we have already finished reading ...
+        if (this.byteCount >= this.contentLength) return -1;        
+        return super.read();
+    }
+    
+    public int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+    
+    public int read(byte[] buffer, int off, int len) throws IOException {
+        if (this.closed) throw new IOException("Stream already closed."); 
+        
+        // if we have already finished reading ...
+        if (this.byteCount >= this.contentLength) return -1; 
+        
+        // only read until body end
+        if (this.byteCount + len > this.contentLength) {
+            len = (int) (this.contentLength - this.byteCount);
+        }                
+        
+        return super.read(buffer, off, len);
+    }
+    
+    public long skip(long len) throws IOException {        
+        long skipLength = Math.min(len, this.contentLength - this.byteCount);
+        return super.skip(skipLength);
+    }    
+
+}

source/de/anomic/http/httpHeader.java

@@ -430,6 +430,18 @@ public final class httpHeader extends TreeMap implements Map {
         return (String) get(httpHeader.CONTENT_TYPE, "application/octet-stream");
     }
     
+    public String getCharacterEncoding() {
+        String mimeType = mime();
+        
+        int idx = mimeType.indexOf(";");
+        if (idx == -1) return null;
+        
+        String encoding = mimeType.substring(idx + 1);
+        if (!encoding.startsWith("charset=")) return null;
+        
+        return encoding.substring("charset=".length()).trim();           
+    }    
+    
     public Date date() {
         return headerDate(httpHeader.DATE);
     }

source/de/anomic/http/httpdByteCountInputStream.java

@@ -5,8 +5,10 @@
 //Frankfurt, Germany, 2004
 //
 // This file is contributed by Martin Thelian
-// last major change: $LastChangedDate$ by $LastChangedBy$
+//
-// Revision: $LastChangedRevision$
+// $LastChangedDate$
+// $LastChangedRevision$
+// $LastChangedBy$
 //
 //This program is free software; you can redistribute it and/or modify
 //it under the terms of the GNU General Public License as published by
@@ -49,16 +51,20 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 
-public final class httpdByteCountInputStream extends FilterInputStream {
+public class httpdByteCountInputStream extends FilterInputStream {
     
     private static final Object syncObject = new Object();
     private static final HashMap byteCountInfo = new HashMap(2);
     private static long globalByteCount = 0;
     
     private boolean finished = false;
-    private long byteCount;
+    protected long byteCount;
     private String byteCountAccountName = null; 
 
+    protected httpdByteCountInputStream(InputStream inputStream) {
+        this(inputStream,null);
+    }
+    
     /**
      * Constructor of this class
      * @param inputStream the {@link InputStream} to read from
@@ -81,13 +87,13 @@ public final class httpdByteCountInputStream extends FilterInputStream {
     
     public int read(byte[] b) throws IOException {
         int readCount = super.read(b);
-        this.byteCount += readCount;
+        if (readCount > 0) this.byteCount += readCount;
         return readCount;
     }
 
     public int read(byte[] b, int off, int len) throws IOException {
         int readCount = super.read(b, off, len);
-        this.byteCount += readCount;
+        if (readCount > 0) this.byteCount += readCount;
         return readCount;
     }
 
@@ -95,6 +101,12 @@ public final class httpdByteCountInputStream extends FilterInputStream {
         this.byteCount++;
         return super.read();
     }
+    
+    public long skip(long len) throws IOException {
+        long skipCount = super.skip(len);
+        if (skipCount > 0) this.byteCount += skipCount; 
+        return skipCount;
+    }
 
     public long getCount() {
         return this.byteCount;