edit createAssocArray function

Mihail
1 parent 7a80e74c
Showing 11 changed files with 163 additions and 73 deletions Show diff stats
backend/components/parsers/CustomCsvParser.php
backend/components/parsers/config.php
backend/config/main.php
backend/controllers/ParserController.php
backend/models/UploadFileParsingForm.php
backend/views/parser/results.php
backend/web/.htaccess
common/components/CustomVarDamp.php
common/components/debug/CustomVarDamp.php
framework/core/Convert.php
frontend/web/.htaccess
@@ -11,23 +11,20 @@ namespace backend\components\parsers;
  
 class CustomCsvParser extends  \yii\multiparser\CsvParser {
  
-    //public $last_line = 10;
+    public $last_line = 10;
     //public $hasHeaderRow = true;
    // public $keys = ['first','second', 'third', 'forth', 'fifth'];
-
-
-    protected function readRow()
+    public function setupConverter()
     {
  
-        $row = parent::readRow();
-
-        if (is_array($row)) {
-
-            $row = Encoder::encodeArray( Encoder::$in_charset, Encoder::$out_charset, $row );
+        if ($this->hasHeaderRow) {
+            // если у файла есть заголовок, то в результате имеем ассоциативный массив
+            $this->converter_conf['hasKey'] = 1;
         }
  
-        return $row;
+        $this->converter = \Yii::createObject($this->converter_conf);
  
     }
  
+
 }
 \ No newline at end of file
+<?php
+ return [
+     'csv' =>
+         ['web' =>
+             ['class' => 'backend\components\parsers\CustomCsvParser',
+                 'auto_detect_first_line' => true,
+                 'converter_conf' => ['class' => 'yii\multiparser\Converter',
+                     'configuration' => [
+                 "string"   => 'DESCR'
+             ]
+                     ,]],
+
+             'basic_column' => [
+                 Null  => 'Пусто',
+                 "BRAND"  => 'Бренд',
+                 "ARTICLE"=> 'Артикул',
+                 "PRICE"  => 'Цена',
+                 "DESCR"  => 'Наименование',
+                 "BOX"    => 'Колво',
+                 "ADD_BOX"=> 'В пути',
+                 "GROUP"  => 'Группа RG'
+             ],
+             ],
+      'xml' =>
+         ['web' =>
+             ['class' => 'yii\multiparser\XmlParser',
+                 'node' => 'Товар',],
+
+             'basic_column' => [
+                 "BRAND"  => 'Производитель',
+                 "ARTICLE"=> 'Код',
+                 "PRICE"  => 'Розница',
+                 "DESCR"  => 'Наименование',
+                 "BOX"    => 'Колво',
+                 "ADD_BOX"=> 'Ожидаемое',
+                 "GROUP"  => 'Группа'
+             ],
+         ]
+ ];
+
+
+//[
+//    "float"   => 'PRICE',
+//    "integer" => ['BOX' , 'ADD_BOX' ],
+//    "prefix"  => 'ARTICLE'
+//]
 \ No newline at end of file
@@ -5,6 +5,7 @@ $params = array_merge(
     require(__DIR__ . '/params.php'),
     require(__DIR__ . '/params-local.php')
 );
+$mp_configuration = require( __DIR__ . '/../components/parsers/config.php');
  
 return [
     'id' => 'app-backend',
@@ -41,6 +42,7 @@ return [
         'multiparser'=>[
  
             'class' => 'yii\multiparser\YiiMultiparser',
+            'configuration' => $mp_configuration,
  
         ],
     ],
@@ -8,7 +8,7 @@ use yii\filters\VerbFilter;
 use backend\models\UploadFileParsingForm;
 use yii\web\UploadedFile;
 use yii\data\ArrayDataProvider;
-use backend\components\parsers\DynamicFormHelper;
+use yii\multiparser\DynamicFormHelper;
 use backend\components\parsers\CustomParserConfigurator;
  
 use common\components\CustomVarDamp;
@@ -96,13 +96,14 @@ class ParserController extends BaseController
             ],
         ]);
  
+       // CustomVarDamp::dumpAndDie($data);
         $header_model = DynamicFormHelper::CreateDynamicModel( count( $data[0] ) );
  
-        //CustomVarDamp::dumpAndDie($header_model);
+     //   CustomVarDamp::dumpAndDie(Yii::$app->multiparser->getConfiguration('csv','basic_column'));
         return $this->render('results',
             ['model' => $data,
                 'header_model' => $header_model,
-                'basic_column' => CustomParserConfigurator::$basic_column,
+                'basic_column' =>  Yii::$app->multiparser->getConfiguration('csv','basic_column'),
                 'dataProvider' => $provider]);
     }
  
@@ -113,12 +114,15 @@ public function actionWrite()
     $arr_attributes = Yii::$app->request->post()['DynamicModel'];
     $model = DynamicFormHelper::CreateDynamicModel( $arr_attributes );
     foreach ($arr_attributes as $key => $value) {
-        $model->addRule($key, 'in', ['range' => array_keys( CustomParserConfigurator::$basic_column )]);
+        $model->addRule($key, 'in', ['range' => array_keys( Yii::$app->multiparser->getConfiguration('csv','basic_column') )]);
     }
  
     //CustomVarDamp::dumpAndDie($model);
     if ($model->validate()) {
         $arr = $model->toArray();
+        $data = json_decode( Yii::$app->getCache()->get( 'parser_data' ),true );
+
+       // CustomVarDamp::dumpAndDie(DynamicFormHelper::CreateAssocArray($data, $arr));
         CustomVarDamp::dumpAndDie($arr);
     }
  
@@ -52,7 +52,6 @@ class UploadFileParsingForm extends Model
     public function readFile($filePath){
  
         $data = Yii::$app->multiparser->parse($filePath);
-       // \common\components\CustomVarDamp::dumpAndDie($data);
         if( !is_array($data) ){
             $data = ['No results'];
         }
 <?php
  
 use yii\helpers\Html;
-use backend\components\parsers\DynamicFormHelper;
+use yii\multiparser\DynamicFormHelper;
 use yii\widgets\ActiveForm;
  
  
@@ -20,7 +20,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
  
     $form = ActiveForm::begin(['action' => 'write']);
         ?>
-    <?= DynamicFormHelper::CreateDynamicGridViewWithDropDownListHeader( $dataProvider, $form, $header_model, $basic_column )?>
+    <?= DynamicFormHelper::CreateGridWithDropDownListHeader( $dataProvider, $form, $header_model, $basic_column )?>
  
     <div class="form-group">
         <?= Html::submitButton(Yii::t('app', 'Записать в БД'), ['class' => 'btn btn-primary']) ?>
+RewriteEngine on
+
+RewriteBase /
+
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+
+RewriteRule . index.php
 \ No newline at end of file
@@ -17,10 +17,16 @@ class CustomVarDamp extends BaseVarDumper  {
         echo "</pre>";
         die;
     }
-    public static function dump($var, $depth = 10, $highlight = false)
+    public static function dump($var, $step = '', $depth = 10, $highlight = false)
     {
         echo "<pre>";
+        if ($step) {
+            echo "-------------- {$step} -------------";
+        }
         echo static::dumpAsString($var, $depth, $highlight);
+        if ($step) {
+            echo "-------------- {$step} -------------";
+        }
         echo "</pre>";
  
     }
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 27.08.2015
+ * Time: 16:47
+ */
+namespace common\components\debug;
+use yii\helpers\BaseVarDumper;
+
+class CustomVarDamp extends BaseVarDumper  {
+
+    public static function dumpAndDie($var, $depth = 10, $highlight = false)
+    {
+        echo "<pre>";
+        echo static::dumpAsString($var, $depth, $highlight);
+        echo "</pre>";
+        die;
+    }
+}
 \ No newline at end of file
@@ -166,63 +166,63 @@ class Convert {
 	}
  
 	/**
-	 * Converts an XML string to a PHP array
-	 * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection
-	 *
-	 * @uses recursiveXMLToArray()
-	 * @param string $val
-	 * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered.
-	 * false by default.
-	 * @param boolean $disableExternals Disables the loading of external entities. false by default.
-	 * @return array
-	 */
-	public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) {
-		// Check doctype
-		if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) {
-			throw new InvalidArgumentException('XML Doctype parsing disabled');
-		}
+ * Converts an XML string to a PHP array
+ * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection
+ *
+ * @uses recursiveXMLToArray()
+ * @param string $val
+ * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered.
+ * false by default.
+ * @param boolean $disableExternals Disables the loading of external entities. false by default.
+ * @return array
+ */
+    public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) {
+        // Check doctype
+        if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) {
+            throw new InvalidArgumentException('XML Doctype parsing disabled');
+        }
  
-		// Disable external entity loading
-		if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals);
-		try {
-			$xml = new SimpleXMLElement($val);
-			$result = self::recursiveXMLToArray($xml);
-		} catch(Exception $ex) {
-			if($disableExternals) libxml_disable_entity_loader($oldVal);
-			throw $ex;
-		}
-		if($disableExternals) libxml_disable_entity_loader($oldVal);
-		return $result;
-	}
+        // Disable external entity loading
+        if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals);
+        try {
+            $xml = new SimpleXMLElement($val);
+            $result = self::recursiveXMLToArray($xml);
+        } catch(Exception $ex) {
+            if($disableExternals) libxml_disable_entity_loader($oldVal);
+            throw $ex;
+        }
+        if($disableExternals) libxml_disable_entity_loader($oldVal);
+        return $result;
+    }
  
-	/**
-	 * Convert a XML string to a PHP array recursively. Do not 
-	 * call this function directly, Please use {@link Convert::xml2array()}
-	 * 
-	 * @param SimpleXMLElement
-	 * 
-	 * @return mixed
-	 */
-	protected static function recursiveXMLToArray($xml) {
-		if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
-			$attributes = $xml->attributes();
-			foreach($attributes as $k => $v) {
-				if($v) $a[$k] = (string) $v;
-			}
-			$x = $xml;
-			$xml = get_object_vars($xml);
-		}
-		if(is_array($xml)) {
-			if(count($xml) == 0) return (string) $x; // for CDATA
-			foreach($xml as $key => $value) {
-				$r[$key] = self::recursiveXMLToArray($value);
-			}
-			if(isset($a)) $r['@'] = $a; // Attributes
-			return $r;
-		}
-		
-		return (string) $xml;
-	}
+    /**
+     * Convert a XML string to a PHP array recursively. Do not
+     * call this function directly, Please use {@link Convert::xml2array()}
+     *
+     * @param SimpleXMLElement
+     *
+     * @return mixed
+     */
+    protected static function recursiveXMLToArray($xml) {
+        if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
+            $attributes = $xml->attributes();
+            foreach($attributes as $k => $v) {
+                if($v) $a[$k] = (string) $v;
+            }
+            $x = $xml;
+            $xml = get_object_vars($xml);
+        }
+        if(is_array($xml)) {
+            if(count($xml) == 0) return (string) $x; // for CDATA
+            foreach($xml as $key => $value) {
+                $r[$key] = self::recursiveXMLToArray($value);
+            }
+            if(isset($a)) $r['@'] = $a; // Attributes
+            return $r;
+        }
+
+        return (string) $xml;
+    }
  
 	/**
 	 * Create a link if the string is a valid URL
+RewriteEngine on
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+RewriteRule . index.php
+
+Options -Indexes
 \ No newline at end of file