From 8d8803b0e26be08bd5684c30e6e76778ca9371b4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 24 May 2014 15:10:43 +0200 Subject: [PATCH] Moved more code to BaseFile as it makes sense to have it there. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../{calculatable => block}/.htaccess | 0 .../interfaces/block/calculatable/.htaccess | 1 + .../calculatable/class_CalculatableBlock.php | 34 ++++ .../class_Block.php} | 25 ++- .../class_SeekableWritableFileIterator.php | 22 +++ .../main/class_BaseFrameworkSystem.php | 175 +----------------- .../main/file_directories/class_BaseFile.php | 156 +++++++++++++++- inc/classes/main/index/class_BaseIndex.php | 12 +- .../main/stacker/file/class_BaseFileStack.php | 6 +- 9 files changed, 243 insertions(+), 188 deletions(-) rename inc/classes/interfaces/{calculatable => block}/.htaccess (100%) create mode 100644 inc/classes/interfaces/block/calculatable/.htaccess create mode 100644 inc/classes/interfaces/block/calculatable/class_CalculatableBlock.php rename inc/classes/interfaces/{calculatable/class_CalculatableBlock.php => block/class_Block.php} (82%) diff --git a/inc/classes/interfaces/calculatable/.htaccess b/inc/classes/interfaces/block/.htaccess similarity index 100% rename from inc/classes/interfaces/calculatable/.htaccess rename to inc/classes/interfaces/block/.htaccess diff --git a/inc/classes/interfaces/block/calculatable/.htaccess b/inc/classes/interfaces/block/calculatable/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/interfaces/block/calculatable/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/classes/interfaces/block/calculatable/class_CalculatableBlock.php b/inc/classes/interfaces/block/calculatable/class_CalculatableBlock.php new file mode 100644 index 00000000..6fad2b2a --- /dev/null +++ b/inc/classes/interfaces/block/calculatable/class_CalculatableBlock.php @@ -0,0 +1,34 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * 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 3 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, see . + */ +interface CalculatableBlock extends Block { + /** + * Calculates minimum length for one entry/block + * + * @return $length Minimum length for one entry/block + */ + function calculateMinimumBlockLength (); +} + +// [EOF] +?> diff --git a/inc/classes/interfaces/calculatable/class_CalculatableBlock.php b/inc/classes/interfaces/block/class_Block.php similarity index 82% rename from inc/classes/interfaces/calculatable/class_CalculatableBlock.php rename to inc/classes/interfaces/block/class_Block.php index 6d472687..88e0e23e 100644 --- a/inc/classes/interfaces/calculatable/class_CalculatableBlock.php +++ b/inc/classes/interfaces/block/class_Block.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,14 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CalculatableBlock extends FrameworkInterface { - /** - * Calculates minimum length for one entry/block - * - * @return $length Minimum length for one entry/block - */ - function caluclateMinimumBlockLength (); - +interface Block extends FrameworkInterface { /** * Checks whether the block separator has been found * @@ -36,6 +29,20 @@ interface CalculatableBlock extends FrameworkInterface { * @return $isFound Whether the block separator has been found */ function isBlockSeparatorFound ($str); + + /** + * Reads the file header + * + * @return void + */ + function readFileHeader (); + + /** + * Flushes the file header + * + * @return void + */ + function flushFileHeader (); } // [EOF] diff --git a/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php b/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php index 263bba68..b8b86be2 100644 --- a/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php +++ b/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php @@ -63,6 +63,28 @@ interface SeekableWritableFileIterator extends SeekableIterator { * @return void */ function analyzeFile (); + + /** + * Checks whether the file header is initialized + * + * @return $isInitialized Whether the file header is initialized + */ + function isFileHeaderInitialized (); + + /** + * Creates the assigned file + * + * @return void + */ + function createFileHeader (); + + /** + * Pre-allocates file (if enabled) with some space for later faster write access. + * + * @param $type Type of the file + * @return void + */ + function preAllocateFile ($type); } // [EOF] diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 214f2a9f..4744d9fe 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -219,7 +219,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { private $indexInstance = NULL; /** - * An instance of a CalculatableBlock class + * An instance of a Block class */ private $blockInstance = NULL; @@ -1342,19 +1342,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Setter for CalculatableBlock instance + * Setter for Block instance * - * @param $blockInstance An instance of an CalculatableBlock class + * @param $blockInstance An instance of an Block class * @return void */ - protected final function setBlockInstance (CalculatableBlock $blockInstance) { + protected final function setBlockInstance (Block $blockInstance) { $this->blockInstance = $blockInstance; } /** - * Getter for CalculatableBlock instance + * Getter for Block instance * - * @return $blockInstance An instance of an CalculatableBlock class + * @return $blockInstance An instance of an Block class */ public final function getBlockInstance () { return $this->blockInstance; @@ -3022,96 +3022,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); } - /** - * Checks whether the file header is initialized - * - * @return $isInitialized Whether the file header is initialized - */ - protected function isFileHeaderInitialized () { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); - - // Is the method there? - assert(is_callable(array($this, 'readFileHeader'))); - - // Default is not initialized - $isInitialized = FALSE; - - // Is the file initialized? - if ($this->isFileInitialized()) { - // Some bytes has been written, so rewind to start of it. - $rewindStatus = $this->getIteratorInstance()->rewind(); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] rewindStatus=%s', __METHOD__, __LINE__, $rewindStatus)); - - // Is the rewind() call successfull? - if ($rewindStatus != 1) { - // Something bad happened - self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Could not rewind().', __METHOD__, __LINE__)); - } // END - if - - // Read file header - $this->readFileHeader(); - - // The above method does already check the header - $isInitialized = TRUE; - } // END - if - - // Return result - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized))); - return $isInitialized; - } - - /** - * Checks whether the assigned file has been initialized - * - * @return $isInitialized Whether the file's size is zero - */ - protected function isFileInitialized () { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); - - // size() must be callable - assert(is_callable(array($this, 'size'))); - - // Get it from iterator which holds the pointer instance. If FALSE is returned - $fileSize = $this->size(); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] fileSize=%s', __METHOD__, __LINE__, $fileSize)); - - /* - * The returned file size should not be FALSE or NULL as this means - * that the pointer class does not work correctly. - */ - assert(is_int($fileSize)); - - // Is more than 0 returned? - $isInitialized = ($fileSize > 0); - - // Return result - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized))); - return $isInitialized; - } - - /** - * Creates the assigned file - * - * @return void - */ - protected function createFileHeader () { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); - - // The method flushFileHeader() must be callable - assert(is_callable(array($this, 'flushFileHeader'))); - - // The file's header should not be initialized here - assert(!$this->isFileHeaderInitialized()); - - // Simple flush file header which will create it. - $this->flushFileHeader(); - - // Rewind seek position (to beginning of file) and update/flush file header - $this->rewineUpdateSeekPosition(); - - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!!', __METHOD__, __LINE__)); - } - /** * Seeks to beginning of file, updates seek position in this object and * flushes the header. @@ -3121,6 +3031,9 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { protected function rewineUpdateSeekPosition () { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); + // flushFileHeader must be callable + assert(is_callable(array($this, 'flushFileHeader'))); + // Seek to beginning of file $this->getIteratorInstance()->rewind(); @@ -3147,76 +3060,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!!', __METHOD__, __LINE__)); } - /** - * Writes data at given position - * - * @param $seekPosition Seek position - * @param $data Data to be written - * @param $flushHeader Whether to flush the header (default: flush) - * @return void - */ - protected function writeData ($seekPosition, $data, $flushHeader = TRUE) { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s,data()=%s - CALLED!', __METHOD__, __LINE__, $seekPosition, strlen($data))); - - // Write data at given position - $this->getIteratorInstance()->writeAtPosition($seekPosition, $data); - - // Update seek position - $this->updateSeekPosition(); - - // Flush the header? - if ($flushHeader === TRUE) { - // Flush header - $this->flushFileHeader(); - - // Seek to old position - $this->seekToOldPosition(); - } // END - if - - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); - } - - /** - * Pre-allocates file (if enabled) with some space for later faster write access. - * - * @param $type Type of the file - * @return void - */ - protected function preAllocateFile ($type) { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); - - // caluclateMinimumBlockLength() must be callable - assert(is_callable(array($this, 'caluclateMinimumBlockLength'))); - - // Is it enabled? - if ($this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_enabled') != 'Y') { - // Not enabled - self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Not pre-allocating file.', __METHOD__, __LINE__)); - - // Don't continue here. - return; - } // END - if - - // Message to user - self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Pre-allocating file ...', __METHOD__, __LINE__)); - - // Calculate minimum length for one entry - $minLengthEntry = $this->caluclateMinimumBlockLength(); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] minLengthEntry=%s', __METHOD__, __LINE__, $minLengthEntry)); - - // Calulcate seek position - $seekPosition = $minLengthEntry * $this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_count'); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s', __METHOD__, __LINE__, $seekPosition)); - - // Now simply write a NUL there. This will pre-allocate the file. - $this->writeData($seekPosition, chr(0)); - - // Rewind seek position (to beginning of file) and update/flush file header - $this->rewineUpdateSeekPosition(); - - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); - } - /** * Checks whether the block separator has been found * diff --git a/inc/classes/main/file_directories/class_BaseFile.php b/inc/classes/main/file_directories/class_BaseFile.php index 303371c6..3da2dc02 100644 --- a/inc/classes/main/file_directories/class_BaseFile.php +++ b/inc/classes/main/file_directories/class_BaseFile.php @@ -165,6 +165,154 @@ y * @return void $this->setPointerInstance($pointerInstance); } + /** + * Writes data at given position + * + * @param $seekPosition Seek position + * @param $data Data to be written + * @param $flushHeader Whether to flush the header (default: flush) + * @return void + */ + protected function writeData ($seekPosition, $data, $flushHeader = TRUE) { + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s,data()=%s - CALLED!', __METHOD__, __LINE__, $seekPosition, strlen($data))); + + // Write data at given position + $this->getPointerInstance()->writeAtPosition($seekPosition, $data); + + // Update seek position + $this->updateSeekPosition(); + + // Flush the header? + if ($flushHeader === TRUE) { + // Flush header + $this->flushFileHeader(); + + // Seek to old position + $this->seekToOldPosition(); + } // END - if + + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); + } + + /** + * Checks whether the file header is initialized + * + * @return $isInitialized Whether the file header is initialized + */ + public function isFileHeaderInitialized () { + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); + + // Default is not initialized + $isInitialized = FALSE; + + // Is the file initialized? + if ($this->isFileInitialized()) { + // Some bytes has been written, so rewind to start of it. + $rewindStatus = $this->getIteratorInstance()->rewind(); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] rewindStatus=%s', __METHOD__, __LINE__, $rewindStatus)); + + // Is the rewind() call successfull? + if ($rewindStatus != 1) { + // Something bad happened + self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Could not rewind().', __METHOD__, __LINE__)); + } // END - if + + // Read file header + $this->getBlockInstance()->readFileHeader(); + + // The above method does already check the header + $isInitialized = TRUE; + } // END - if + + // Return result + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized))); + return $isInitialized; + } + + /** + * Checks whether the assigned file has been initialized + * + * @return $isInitialized Whether the file's size is zero + */ + public function isFileInitialized () { + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); + + // Get it from iterator which holds the pointer instance. If FALSE is returned + $fileSize = $this->size(); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] fileSize=%s', __METHOD__, __LINE__, $fileSize)); + + /* + * The returned file size should not be FALSE or NULL as this means + * that the pointer class does not work correctly. + */ + assert(is_int($fileSize)); + + // Is more than 0 returned? + $isInitialized = ($fileSize > 0); + + // Return result + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized))); + return $isInitialized; + } + + /** + * Creates the assigned file + * + * @return void + */ + public function createFileHeader () { + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); + + // The file's header should not be initialized here + assert(!$this->isFileHeaderInitialized()); + + // Simple flush file header which will create it. + $this->getBlockInstance()->flushFileHeader(); + + // Rewind seek position (to beginning of file) and update/flush file header + $this->rewineUpdateSeekPosition(); + + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!!', __METHOD__, __LINE__)); + } + + /** + * Pre-allocates file (if enabled) with some space for later faster write access. + * + * @param $type Type of the file + * @return void + */ + public function preAllocateFile ($type) { + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); + + // Is it enabled? + if ($this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_enabled') != 'Y') { + // Not enabled + self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Not pre-allocating file.', __METHOD__, __LINE__)); + + // Don't continue here. + return; + } // END - if + + // Message to user + self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Pre-allocating file ...', __METHOD__, __LINE__)); + + // Calculate minimum length for one entry + $minLengthEntry = $this->getBlockInstance()->calculateMinimumBlockLength(); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] minLengthEntry=%s', __METHOD__, __LINE__, $minLengthEntry)); + + // Calulcate seek position + $seekPosition = $minLengthEntry * $this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_count'); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s', __METHOD__, __LINE__, $seekPosition)); + + // Now simply write a NUL there. This will pre-allocate the file. + $this->writeData($seekPosition, chr(0)); + + // Rewind seek position (to beginning of file) and update/flush file header + $this->rewineUpdateSeekPosition(); + + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); + } + /** * Close a file source and set it's instance to null and the file name * to empty @@ -301,8 +449,8 @@ y * @return void // Get current entry $current = $this->getCurrentBlock(); - // Simply output it - self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] current=%s', __METHOD__, __LINE__, print_r($current, TRUE))); + // Debug message + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] current()=%s', __METHOD__, __LINE__, strlen($current))); } // END - while //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__)); @@ -325,7 +473,7 @@ y * @return void assert($this->getBlockInstance() instanceof CalculatableBlock); // First calculate minimum block length - $length = $this->getBlockInstance()->caluclateMinimumBlockLength(); + $length = $this->getBlockInstance()->calculateMinimumBlockLength(); // Short be more than zero! assert($length > 0); @@ -378,7 +526,7 @@ y * @return void assert($this->getBlockInstance() instanceof CalculatableBlock); // First calculate minimum block length - $length = $this->getBlockInstance()->caluclateMinimumBlockLength(); + $length = $this->getBlockInstance()->calculateMinimumBlockLength(); // Short be more than zero! assert($length > 0); diff --git a/inc/classes/main/index/class_BaseIndex.php b/inc/classes/main/index/class_BaseIndex.php index fd577241..8347af67 100644 --- a/inc/classes/main/index/class_BaseIndex.php +++ b/inc/classes/main/index/class_BaseIndex.php @@ -54,7 +54,7 @@ class BaseIndex extends BaseFrameworkSystem { * * @return void */ - protected function readFileHeader () { + public function readFileHeader () { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); // First rewind to beginning as the header sits at the beginning ... @@ -114,7 +114,7 @@ class BaseIndex extends BaseFrameworkSystem { * * @return void */ - protected function flushFileHeader () { + public function flushFileHeader () { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); // Put all informations together @@ -162,12 +162,12 @@ class BaseIndex extends BaseFrameworkSystem { $this->setIteratorInstance($iteratorInstance); // Is the file's header initialized? - if (!$this->isFileHeaderInitialized()) { + if (!$this->getIteratorInstance()->isFileHeaderInitialized()) { // No, then create it (which may pre-allocate the index) - $this->createFileHeader(); + $this->getIteratorInstance()->createFileHeader(); // And pre-allocate a bit - $this->preAllocateFile('index'); + $this->getIteratorInstance()->preAllocateFile('index'); } // END - if // Load the file header @@ -182,7 +182,7 @@ class BaseIndex extends BaseFrameworkSystem { * * @return $length Minimum length for one entry/block */ - public function caluclateMinimumBlockLength () { + public function calculateMinimumBlockLength () { // Calulcate it // @TODO Not finished yet $length = 0; diff --git a/inc/classes/main/stacker/file/class_BaseFileStack.php b/inc/classes/main/stacker/file/class_BaseFileStack.php index 9219ecc3..3cc3240a 100644 --- a/inc/classes/main/stacker/file/class_BaseFileStack.php +++ b/inc/classes/main/stacker/file/class_BaseFileStack.php @@ -57,7 +57,7 @@ class BaseFileStack extends BaseStacker { * @return void * @todo To hard assertions here, better rewrite them to exceptions */ - protected function readFileHeader () { + public function readFileHeader () { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); // First rewind to beginning as the header sits at the beginning ... @@ -121,7 +121,7 @@ class BaseFileStack extends BaseStacker { * * @return void */ - protected function flushFileHeader () { + public function flushFileHeader () { //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__)); // Put all informations together @@ -377,7 +377,7 @@ class BaseFileStack extends BaseStacker { * * @return $length Minimum length for one entry/block */ - public function caluclateMinimumBlockLength () { + public function calculateMinimumBlockLength () { // Calulcate it $length = self::getHashLength() + strlen(chr(self::SEPARATOR_HASH_NAME)) + self::LENGTH_NAME + 1 + strlen(self::getBlockSeparator()); -- 2.30.2