edit universal csv parser

Mihail
1 parent 574db870
Showing 2 changed files with 20 additions and 17 deletions Show diff stats
backend/components/parsers/CsvParser.php
backend/views/parser/results.php
@@ -35,7 +35,7 @@ class CsvParser implements \IteratorAggregate {
     /** @var array - array of headers values */
     private $keys;
-    public function setup( $file, $first_line, $first_column, $hasHeaderRow = TRUE, $delimiter = ';')
+    public function setup( $file, $first_line, $first_column, $hasHeaderRow = false, $delimiter = ';')
     {
         $this->first_line = $first_line;
@@ -57,15 +57,7 @@ class CsvParser implements \IteratorAggregate {
         return new \ArrayIterator($this->read());
     }
-    /**
-     * @return array
-     * @throws InvalidFileException
-     * @deprecated Use ::read instead.
-     */
-    public function parseAll()
-    {
-        return $this->read();
-    }
+
     /**
      * @return array
@@ -106,22 +98,29 @@ class CsvParser implements \IteratorAggregate {
     }
-    private function closeHandler()
+    protected function closeHandler()
     {
         $this->file = NULL;
     }
-    private function readRow()
+    protected function readRow()
         // @todo add comments
     {
-        $dirt_value_arr = $this->file->fgetcsv(  );
-        $dirt_value_arr = array_slice( $dirt_value_arr, $this->first_column );
-        $clear_arr = Encoder::encodeArray( $this->in_charset, $this->out_charset, $dirt_value_arr );
+
+        $row = $this->file->fgetcsv(  );
+        //
+        if (is_array($row)) {
+            $row = array_slice( $row, $this->first_column );
+            $row = Encoder::encodeArray( $this->in_charset, $this->out_charset, $row );
+        } else{
+            $row = false;
+        }
+
 //        if ($this->keys !== NULL)
-//            @$clear_arr[3] = ValueFilter::pricefilter($clear_arr[3]);
+//            @$clear_arr[3] = ValueFilter::pricefilter($clear_arr[3]);{}{}{}
-        return $clear_arr;
+        return $row;
     }
@@ -2,6 +2,7 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\grid\SerialColumn;
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CatalogSearch */
@@ -19,6 +20,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
+        'columns' => [['class' => SerialColumn::className()],
+            '1',
+            '2',]
     ]); ?>
     <?= Html::a('Вернуться', ['parser/index'], ['class' => 'btn btn-primary', 'name' => 'Return',]) ?>