X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fstacker%2Ffile%2Fclass_BaseFileStack.php;h=9da9da446295243b158c47514eed63212770cce9;hb=1203de1295dd16b8f4d89ff58ffe61aa49760be9;hp=6b50a6e0d934b81b3c0d434972dcdfa5c00d3452;hpb=202f8c1c1d46d1292918b7110547952446a53391;p=core.git

diff --git a/inc/classes/main/stacker/file/class_BaseFileStack.php b/inc/classes/main/stacker/file/class_BaseFileStack.php
index 6b50a6e0..9da9da44 100644
--- a/inc/classes/main/stacker/file/class_BaseFileStack.php
+++ b/inc/classes/main/stacker/file/class_BaseFileStack.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -60,7 +60,7 @@ class BaseFileStack extends BaseStacker {
 
 		// Last character must be the separator
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] data(-1)=%s', __METHOD__, __LINE__, dechex(ord(substr($data, -1, 1)))));
-		assert(substr($data, -1, 1) == chr(BaseFile::SEPARATOR_HEADER_ENTRIES));
+		assert(substr($data, -1, 1) == chr(BaseBinaryFile::SEPARATOR_HEADER_ENTRIES));
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Passed assert().', __METHOD__, __LINE__));
 
 		// Okay, then remove it
@@ -76,7 +76,7 @@ class BaseFileStack extends BaseStacker {
 		 * 1 => total entries
 		 * 2 => current seek position
 		 */
-		$header = explode(chr(BaseFile::SEPARATOR_HEADER_DATA), $data);
+		$header = explode(chr(BaseBinaryFile::SEPARATOR_HEADER_DATA), $data);
 
 		// Set header here
 		$this->getIteratorInstance()->setHeader($header);
@@ -91,9 +91,9 @@ class BaseFileStack extends BaseStacker {
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Passed assert().', __METHOD__, __LINE__));
 
 		// Check length of count and seek position
-		assert(strlen($header[1]) == BaseFile::LENGTH_COUNT);
+		assert(strlen($header[1]) == BaseBinaryFile::LENGTH_COUNT);
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Passed assert().', __METHOD__, __LINE__));
-		assert(strlen($header[2]) == BaseFile::LENGTH_POSITION);
+		assert(strlen($header[2]) == BaseBinaryFile::LENGTH_POSITION);
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Passed assert().', __METHOD__, __LINE__));
 
 		// Decode count and seek position
@@ -117,23 +117,23 @@ class BaseFileStack extends BaseStacker {
 			self::STACK_MAGIC,
 
 			// Separator magic<->count
-			chr(BaseFile::SEPARATOR_HEADER_DATA),
+			chr(BaseBinaryFile::SEPARATOR_HEADER_DATA),
 
 			// Total entries (will be zero) and pad it to 20 chars
-			str_pad($this->dec2hex($this->getIteratorInstance()->getCounter()), BaseFile::LENGTH_COUNT, '0', STR_PAD_LEFT),
+			str_pad($this->dec2hex($this->getIteratorInstance()->getCounter()), BaseBinaryFile::LENGTH_COUNT, '0', STR_PAD_LEFT),
 
 			// Separator count<->seek position
-			chr(BaseFile::SEPARATOR_HEADER_DATA),
+			chr(BaseBinaryFile::SEPARATOR_HEADER_DATA),
 
 			// Position (will be zero)
-			str_pad($this->dec2hex($this->getSeekPosition(), 2), BaseFile::LENGTH_POSITION, '0', STR_PAD_LEFT),
+			str_pad($this->dec2hex($this->getIteratorInstance()->getSeekPosition(), 2), BaseBinaryFile::LENGTH_POSITION, '0', STR_PAD_LEFT),
 
 			// Separator position<->entries
-			chr(BaseFile::SEPARATOR_HEADER_ENTRIES)
+			chr(BaseBinaryFile::SEPARATOR_HEADER_ENTRIES)
 		);
 
 		// Write it to disk (header is always at seek position 0)
-		$this->writeData(0, $header, FALSE);
+		$this->getIteratorInstance()->writeData(0, $header, FALSE);
 
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
@@ -162,11 +162,11 @@ class BaseFileStack extends BaseStacker {
 		// Calculate header size
 		$this->getIteratorInstance()->setHeaderSize(
 			strlen(self::STACK_MAGIC) +
-			strlen(chr(BaseFile::SEPARATOR_HEADER_DATA)) +
-			BaseFile::LENGTH_COUNT +
-			strlen(chr(BaseFile::SEPARATOR_HEADER_DATA)) +
-			BaseFile::LENGTH_POSITION +
-			strlen(chr(BaseFile::SEPARATOR_HEADER_ENTRIES))
+			strlen(chr(BaseBinaryFile::SEPARATOR_HEADER_DATA)) +
+			BaseBinaryFile::LENGTH_COUNT +
+			strlen(chr(BaseBinaryFile::SEPARATOR_HEADER_DATA)) +
+			BaseBinaryFile::LENGTH_POSITION +
+			strlen(chr(BaseBinaryFile::SEPARATOR_HEADER_ENTRIES))
 		);
 
 		// Init counters and gaps array
@@ -410,7 +410,7 @@ class BaseFileStack extends BaseStacker {
 	 */
 	public function calculateMinimumBlockLength () {
 		// Calulcate it
-		$length = self::getHashLength() + strlen(chr(BaseFile::SEPARATOR_HASH_NAME)) + BaseFile::LENGTH_NAME + 1 + strlen(chr(BaseFile::SEPARATOR_ENTRIES));
+		$length = self::getHashLength() + strlen(chr(BaseBinaryFile::SEPARATOR_HASH_NAME)) + BaseBinaryFile::LENGTH_NAME + 1 + strlen(chr(BaseBinaryFile::SEPARATOR_ENTRIES));
 
 		// Return it
 		return $length;
@@ -491,6 +491,15 @@ class BaseFileStack extends BaseStacker {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__, $this->getIteratorInstance()->getPointerInstance()), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 
+	/**
+	 * "Getter" for file size
+	 *
+	 * @return	$fileSize	Size of currently loaded file
+	 */
+	public function getFileSize () {
+		// Call iterator's method
+		return $this->getIteratorInstance()->getFileSize();
+	}
 }
 
 // [EOF]