Continued:

[core.git] / framework / main / classes / stacker / file / class_BaseFileStack.php

diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php
index 859eebd885f5d7476a1eda9cbc33a839b9c29dbf..63686de9f14a0640f8876a43b16670ff11cd2477 100644 (file)
--- a/framework/main/classes/stacker/file/class_BaseFileStack.php
+++ b/framework/main/classes/stacker/file/class_BaseFileStack.php
@@ -269,8 +269,8 @@ abstract class BaseFileStack extends BaseStacker implements StackableFile {
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: created=%d', intval($created)));
                if (!$created) {
                        // Count all entries in file
-                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FILE-STACK: Calling this->iteratorInstance->analyzeFile() ...');
-                       $this->getIteratorInstance()->analyzeFile();
+                       /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FILE-STACK: Calling this->iteratorInstance->analyzeFileStructure() ...');
+                       $this->getIteratorInstance()->analyzeFileStructure();
                }
 
                /*
@@ -542,9 +542,10 @@ abstract class BaseFileStack extends BaseStacker implements StackableFile {
         */
        public function calculateMinimumBlockLength () {
                // Is the value "cached"?
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FILE-STACK: CALLED!');
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FILE-STACK: CALLED!');
                if (self::$minimumBlockLength == 0) {
                        // Calulcate it
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FILE-STACK: Calculating ...');
                        self::$minimumBlockLength =
                                // Length of entry group
                                BaseBinaryFile::LENGTH_GROUP + strlen(chr(BaseBinaryFile::SEPARATOR_GROUP_HASH)) +
@@ -555,7 +556,7 @@ abstract class BaseFileStack extends BaseStacker implements StackableFile {
                }
 
                // Return it
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: self::minimumBlockLength=%d - EXIT!', self::$minimumBlockLength));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: self::minimumBlockLength=%d - EXIT!', self::$minimumBlockLength));
                return self::$minimumBlockLength;
        }
 
@@ -563,7 +564,7 @@ abstract class BaseFileStack extends BaseStacker implements StackableFile {
         * Initializes counter for valid entries, arrays for damaged entries and
         * an array for gap seek positions. If you call this method on your own,
         * please re-analyze the file structure. So you are better to call
-        * analyzeFile() instead of this method.
+        * analyzeFileStructure() instead of this method.
         *
         * @return      void
         * @throws      UnsupportedOperationException   This method is not (and maybe never will be) supported