parser

Mihail
1 parent 2772f19c
Showing 5 changed files with 17 additions and 36 deletions Show diff stats
backend/components/parsers/ParserHandler.php
backend/controllers/ParserController.php
backend/views/parser/index.php
backend/views/parser/results.php
vendor/hranicka/csv/src/Reader.php
@@ -22,7 +22,7 @@ class ParserHandler {
         $this->run();
     }
-    private function run(){
+    public function run(){
         if ($this->extension = '.csv'){
             $csvParser = new Reader( $this->filePath );
             return $csvParser->read();
@@ -63,10 +63,12 @@ class ParserController extends Controller
                 $filePath = Yii::getAlias('@webroot') . '/uploads/' . $model->file->baseName . '.' . $model->file->extension;
                 $model->file->saveAs( $filePath );
-                $data = new ParserHandler( $filePath );
-//                echo "<pre>";
-//                var_dump($data);
-//                echo "</pre>";
+                $parser = new ParserHandler( $filePath );
+                $data = $parser->run();
+
+                if( !is_array($data) ){
+                    $data = ['No results'];
+                }
                 $provider = new ArrayDataProvider([
                     'allModels' => $data,
                     'pagination' => [
@@ -78,7 +80,7 @@ class ParserController extends Controller
                 ]);
                 return $this->render('results',
-                    ['model' => $model,
+                    ['model' => $data,
                         'dataProvider' => $provider]);
             }
         }
 <?php
 use yii\widgets\ActiveForm;
 ?>
-
+    <div class="catalog-view">
 <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]) ?>
 <?= $form->field($model, 'file')->fileInput() ?>
 <button>Прочитать</button>
-<?php ActiveForm::end() ?>
 \ No newline at end of file
+<?php ActiveForm::end() ?>
+        </div>
 \ No newline at end of file
@@ -4,43 +4,21 @@ use yii\helpers\Html;
 use yii\grid\GridView;
 /* @var $this yii\web\View */
-/* @var $searchModel backend\models\ArticlesSearch */
+/* @var $searchModel backend\models\CatalogSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
 $this->title = 'Results';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="articles-index">
+<div class="catalog-index">
     <h1><?= Html::encode($this->title) ?></h1>
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-    <p>
-        <?= Html::a('Создать', ['create', 'type' =>$type], ['class' => 'btn btn-success']) ?>
-    </p>
+
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id',
-            'name',
-            'translit',
-            'title',
-            [
-                'format' => 'image',
-                'attribute'=>'image',
-            ],
-            // 'body:ntext',
-            // 'meta_title',
-            // 'description',
-            // 'h1',
-            // 'seo_text:ntext',
-
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
     ]); ?>
 </div>
 \ No newline at end of file
@@ -41,7 +41,7 @@ class Reader implements \IteratorAggregate
 	 * @param string $escape
 	 * @return $this
 	 */
-	public function setup($delimiter = ',', $enclosure = '"', $escape = '\')
+	public function setup($delimiter = ';', $enclosure = '"', $escape = '\')
 	{
 		$this->delimiter = $delimiter;
 		$this->enclosure = $enclosure;
@@ -93,8 +93,8 @@ class Reader implements \IteratorAggregate
 //                        var_dump($return);
 //                        echo "</pre>";
 //                        die;
-//						throw new InvalidFileException("Invalid columns detected on line #$line .");
-                        return $return;
+						throw new InvalidFileException("Invalid columns detected on line #$line .");
+                       // return $return;
 					}
 					$return[] = array_combine($keys, $row);