Some updates:

[core.git] / framework / main / classes / file_directories / text / input / csv / class_CsvInputFile.php

diff --git a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
index 93c9aec16c2511d26cbb3f059d71bf992dde65d0..a2e30e735d59b7b31a814aacc374e0bdce6d7151 100644 (file)
--- a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
+++ b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filesystem\Input\Csv;
+namespace Org\Mxchange\CoreFramework\Filesystem\Input\Csv;
 
 // Import framework stuff
-use CoreFramework\Filesystem\Text\BaseInputTextFile;
-use CoreFramework\Stream\Filesystem\CsvInputStreamer;
+use Org\Mxchange\CoreFramework\Filesystem\Text\BaseInputTextFile;
+use Org\Mxchange\CoreFramework\Stream\Filesystem\CsvInputStreamer;
 
 /**
  * A CSV file input class for writing CSV files
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -49,9 +53,6 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                // Get a new instance
                $fileInstance = new CsvInputFile();
 
-               // Set file name
-               $fileInstance->setFileName($fileName);
-
                // Init this abstract file
                $fileInstance->initFile($fileName);
 
@@ -102,7 +103,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                $lineArray = array();
 
                // Whether the parser reads a quoted string (which may contain the column separator again)
-               $isInQuotes = FALSE;
+               $isInQuotes = false;
 
                // Init column data
                $column = '';
@@ -116,7 +117,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] idx=%s,char=%s ...', __METHOD__, __LINE__, $idx, $char));
 
                        // Is the column separator found and not within quotes?
-                       if (($isInQuotes === FALSE) && ($char == $columnSeparator)) {
+                       if (($isInQuotes === false) && ($char == $columnSeparator)) {
                                // Debug message
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Adding column=%s ...', __METHOD__, __LINE__, $column));
 
@@ -136,7 +137,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] column=%s ...', __METHOD__, __LINE__, $column));
 
                                // $column must be empty at this point if we are at starting quote
-                               assert(($isInQuotes === TRUE) || (empty($column)));
+                               assert(($isInQuotes === true) || (empty($column)));
 
                                // Double-quote found, so flip variable
                                $isInQuotes = (!$isInQuotes);