Changeset 975 for GTP/trunk/Lib/Vis/Preprocessing/src/GzBinFileInputStream.cpp

Timestamp:

05/22/06 18:32:12 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GzBinFileInputStream.cpp (modified) (5 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GzBinFileInputStream.cpp

@@ -66 +66 @@
 
 #include "GzBinFileInputStream.h"
+#include "common.h"
 
 XERCES_CPP_NAMESPACE_BEGIN
@@ -74 +75 @@
 GzBinFileInputStream::GzBinFileInputStream(const XMLCh* const fileName
                                        , MemoryManager* const manager) :
-
-    //fSource(0) , 
-fMemoryManager(manager)
+//fSource(0) ,
+fMemoryManager(manager),
+mCurrentPos(0)
 {
         // Try to open the file
-    //fSource = XMLPlatformUtils::openFile((unsignedfileName, manager);
+    //fSource = XMLPlatformUtils::openFile(fileName, manager);
+        // todo: delete xmlstring
         char *myFileName = XMLString::transcode(fileName);
+        //mStream.open(myFileName, ios::binary);
         mStream.open(myFileName);
 }
@@ -86 +89 @@
 GzBinFileInputStream::GzBinFileInputStream(const char* const fileName,
                                                                                    MemoryManager* const manager) :
-fMemoryManager(manager)
+fMemoryManager(manager),
+mCurrentPos(0)
 {
     // Try to open the file
+        //mStream.open(fileName, ios::binary);
         mStream.open(fileName);
 }
@@ -123 +128 @@
 unsigned int GzBinFileInputStream::curPos() const
 {
-    return XMLPlatformUtils::curFilePos(fSource, fMemoryManager);
+    //return XMLPlatformUtils::curFilePos(fSource, fMemoryManager);
+        return mCurrentPos;
 }
 
-unsigned int
-GzBinFileInputStream::readBytes(          XMLByte* const  toFill
-                                , const unsigned int    maxToRead)
+unsigned int GzBinFileInputStream::readBytes(XMLByte* const  toFill, 
+                                                                                         const unsigned int maxToRead)
 {
     //
@@ -134 +139 @@
     //  actually read.
     //
-    //return XMLPlatformUtils::readFileBuffer(fSource, maxToRead, toFill, fMemoryManager);
-        mStream.getline((char *)toFill, maxToRead);
-        return mStream.gcount();
+    //unsigned int result = XMLPlatformUtils::readFileBuffer(fSource, maxToRead, toFill, fMemoryManager);
+        mStream.read((char *)toFill, maxToRead);
+        
+        unsigned int result = mStream.gcount();
+        mCurrentPos = mStream.tellg();
+        //GtpVisibilityPreprocessor::Debug << "here1001 " << maxToRead << " haha " << toFill << " " << result << endl;
+
+        return result;
 }