Moved generic base classes from 'hub' project to core

[hub.git] / application / hub / main / package / assembler / class_PackageAssembler.php

diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index ab4d468dbdaf1f36da20e8110281ab91e819f21d..1d8d783e9cb1a6a326ed13ee26a3432d38b5c4b5 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -51,6 +51,12 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
                // Set package instance here
                $assemblerInstance->setPackageInstance($packageInstance);
 
+               // Create an instance of a raw data input stream
+               $streamInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_input_stream_class');
+
+               // And set it
+               $assemblerInstance->setInputStreamInstance($streamInstance);
+
                // Return the prepared instance
                return $assemblerInstance;
        }
@@ -79,7 +85,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
         */
        private function isPackageContentCompleted (array $packageContent) {
                // Check both
-               $isCompleted = ((substr($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA], 0, 5) == '[[S]]') && (substr($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA], -5, 5) == '[[E]]'));
+               $isCompleted = $this->ifStartEndMarkersSet($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA]);
 
                // Return status
                return $isCompleted;
@@ -188,8 +194,8 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
 
                // Init fake array
                $packageContent = array(
-                       BaseRawDataHandler::PACKAGE_RAW_DATA => $this->pendingData,
-                       BaseRawDataHandler::PACKAGE_ERROR_CODE   => BaseRawDataHandler::SOCKET_ERROR_UNHANDLED
+                       BaseRawDataHandler::PACKAGE_RAW_DATA   => $this->getInputStreamInstance()->streamData($this->pendingData),
+                       BaseRawDataHandler::PACKAGE_ERROR_CODE => BaseRawDataHandler::SOCKET_ERROR_UNHANDLED
                );
 
                // Clear pending data