Merge remote-tracking branch 'origin/master'

Administrator
2 parents 6a016cfa 77422ce3
Showing 5 changed files with 84 additions and 42 deletions Show diff stats
backend/components/parsers/CsvParser.php
backend/components/parsers/Encoder.php
backend/controllers/ParserController.php
backend/models/UploadForm.php → backend/models/UploadFileParsingForm.php
backend/views/parser/index.php
@@ -27,36 +27,18 @@ class CsvParser implements \IteratorAggregate {
     /** @var out encoding charset */
     private $first_line;
-
-
-
-//    public function encodeFile( $in_charset, $out_charset, $filePath ){
-//
-//        $old_content = file_get_contents( $filePath );
-//        $encode_content = iconv( $in_charset, $out_charset, $old_content );
-//        $file = @fopen( $filePath, "w" );
-//        fwrite( $file, $encode_content );
-//        @fclose( $file );
-//
-//    }
-
-
-    /**
-     * @param string $delimiter
-     * @param string $enclosure
-     * @param string $escape
-     * @return $this
-     */
-    public function setup( $file, $first_line = 1, $hasHeaderRow = TRUE, $delimiter = ';')
+    public function setup( $file, $first_line, $hasHeaderRow = TRUE, $delimiter = ';')
     {
+        $this->first_line = $first_line;
+
         $this->file = $file;
         $this->file->setCsvControl($delimiter);
         $this->file->setFlags(\SplFileObject::READ_CSV);
         $this->file->seek( $this->first_line );
-        $this->first_line = $first_line;
+
         $this->in_charset = 'windows-1251';
         $this->hasHeaderRow = $hasHeaderRow;
     }
@@ -82,6 +64,7 @@ class CsvParser implements \IteratorAggregate {
      */
     public function read()
     {
+        // @todo add comments
         $return = [];
         $line = 0;
@@ -120,21 +103,22 @@ class CsvParser implements \IteratorAggregate {
     }
     private function readRow()
+        // @todo add comments
     {
         $dirt_value_arr = $this->file->fgetcsv(  );
-        $encode_arr = $this->encodeArray( $dirt_value_arr );
-
-        return $encode_arr;
+        $dirt_value_arr = array_slice( $dirt_value_arr, 2 );
+        $clear_arr = Encoder::encodeArray( $this->in_charset, $this->out_charset, $dirt_value_arr );
+        return $clear_arr;
     }
-    private function encodeArray( $array_to_encode )
-    {
-        return array_map(function($array_to_encode) {
-            return iconv( $this->in_charset, $this->out_charset, $array_to_encode );
-        }, $array_to_encode);
-
-    }
+//    private function encodeArray( $array_to_encode )
+//    {
+//        return array_map(function($array_to_encode) {
+//            return iconv( $this->in_charset, $this->out_charset, $array_to_encode );
+//        }, $array_to_encode);
+//
+//    }
 }
 \ No newline at end of file
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 27.08.2015
+ * Time: 13:36
+ */
+
+namespace app\components\parsers;
+
+// @todo add comments
+class Encoder
+{
+    public static $in_charset;
+    public static $out_charset;
+
+
+    public static function encodeFile($in_charset, $out_charset, $filePath)
+    {
+
+        $old_content = file_get_contents($filePath);
+        $encode_content = self::encode( $in_charset, $out_charset, $old_content );
+        $file = @fopen($filePath, "w");
+        fwrite($file, $encode_content);
+        @fclose($file);
+    }
+
+    public static function encodeArray($in_charset, $out_charset, $array)
+    {
+
+        self::$in_charset = $in_charset;
+        self::$out_charset = $out_charset;
+
+        $result = array_map(
+            function ( $array) {
+
+                return self::encode( self::$in_charset, self::$out_charset, $array );
+
+            },
+            $array);
+
+        return $result;
+    }
+
+    private static function encode( $in_charset, $out_charset, $source ){
+
+        return iconv($in_charset, $out_charset, $source);
+
+    }
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ use Yii;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\filters\VerbFilter;
-use app\models\UploadForm;
+use app\models\UploadFileParsingForm;
 use yii\web\UploadedFile;
 use yii\data\ArrayDataProvider;
 use app\components\parsers\ParserHandler;
@@ -54,7 +54,7 @@ class ParserController extends Controller
     public function actionIndex()
     {
-        $model = new UploadForm();
+        $model = new UploadFileParsingForm();
         if (Yii::$app->request->isPost) {
             $model->file = UploadedFile::getInstance($model, 'file');
@@ -63,7 +63,7 @@ class ParserController extends Controller
                 $filePath = Yii::getAlias('@webroot') . '/uploads/' . $model->file->baseName . '.' . $model->file->extension;
                 $model->file->saveAs( $filePath );
-                $parser = new ParserHandler( $filePath, 0 );
+                $parser = new ParserHandler( $filePath, 1 );
                 $data = $parser->run();
                 if( !is_array($data) ){
@@ -7,7 +7,7 @@ use yii\web\UploadedFile;
 /**
  * UploadForm is the model behind the upload form.
  */
-class UploadForm extends Model
+class UploadFileParsingForm extends Model
 {
     /**
      * @var UploadedFile file attribute
 <?php
 use yii\widgets\ActiveForm;
+use yii\helpers\Html;
+
 ?>
-    <div class="catalog-view">
-<?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]) ?>
+<div class="row">
+    <div class="col-lg-5">
+        <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]) ?>
+        <?= $form->field($model, 'first_line') ?>
+        <?= $form->field($model, 'first_column') ?>
-<?= $form->field($model, 'file')->fileInput() ?>
+        <?= $form->field($model, 'file')->fileInput() ?>
-<button>Прочитать</button>
+        <div class="form-group">
+            <?= Html::submitButton(Yii::t('app', 'Submit'), ['class' => 'btn btn-primary']) ?>
+        </div>
-<?php ActiveForm::end() ?>
-        </div>
 \ No newline at end of file
+        <?php ActiveForm::end() ?>
+    </div>
+</div>
 \ No newline at end of file