Changeset 841:e1c6ec0a0736

Timestamp:

07/09/12 16:53:05 (13 years ago)

Author:

JcDenis

Branch:

default

Message:

Flat import errors are now more verbose, fixes #888

Location:

plugins/importExport

Files:

• _define.php (modified) (1 diff)
• inc/flat/class.flat.backup.php (modified) (7 diffs)
• inc/flat/class.flat.import.php (modified) (5 diffs)
• locales/fr/main.po (modified) (4 diffs)
• script.js (deleted)

plugins/importExport/_define.php

@@ -16 +16 @@
      /* Description*/         "Import and Export your blog",
      /* Author */             "Olivier Meunier & Contributors",
-     /* Version */            '3.0',
+     /* Version */            '3.1',
      /* Perm */               'admin'
 );

plugins/importExport/inc/flat/class.flat.backup.php

@@ -17 +17 @@
      private $line_cols = array();
      private $line_name;
+     private $line_num;
      
      private $replacement = array(
@@ -29 +30 @@
           if (file_exists($file) && is_readable($file)) {
                $this->fp = fopen($file,'rb');
+               $this->line_num = 1;
           } else {
                throw new Exception(__('No file to read.'));
@@ -43 +45 @@
      public function getLine()
      {
-          if (feof($this->fp)) {
+          if (($line = $this->nextLine()) === false) {
                return false;
           }
-          
-          $line = trim(fgets($this->fp));
           
           if (substr($line,0,1) == '[')
@@ -64 +64 @@
                
                if (count($this->line_cols) != count($line)) {
-                    throw new Exception('Invalid row count');
+                    throw new Exception(sprintf('Invalid row count at line %s',$this->line_num));
                }
                
@@ -74 +74 @@
                }
                
-               return new flatBackupItem($this->line_name,$res);
+               return new flatBackupItem($this->line_name,$res,$this->line_num);
           }
           else
@@ -81 +81 @@
           }
      }
+     
+     private function nextLine()
+     {
+          if (feof($this->fp)) {
+               return false;
+          }
+          $this->line_num++;
+          
+          $line = fgets($this->fp);
+          $line = trim($line);
+          
+          return empty($line) ? $this->nextLine() : $line;
+     }
 }
 
@@ -86 +99 @@
 {
      public $__name;
+     public $__line;
      private $__data = array();
      
-     public function __construct($name,$data)
+     public function __construct($name,$data,$line)
      {
           $this->__name = $name;
           $this->__data = $data;
+          $this->__line = $line;
      }
      

plugins/importExport/inc/flat/class.flat.import.php

@@ -630 +630 @@
                $this->stack['post_id']++;
           } else {
-               throw new Exception(__('The backup file does not appear to be well formed.'));
+               self::throwIdError($post->__name,$post->__line,'category');
           }
      }
@@ -640 +640 @@
                $this->insertMeta($meta);
           } else {
-               throw new Exception(__('The backup file does not appear to be well formed.'));
+               self::throwIdError($meta->__name,$meta->__line,'post');
           }
      }
@@ -666 +666 @@
                
                $this->insertPostMedia($post_media);
-          } else {
-               throw new Exception(__('The backup file does not appear to be well formed.'));
+          } elseif (!isset($this->old_ids['media'][(integer) $post_media->media_id])) {
+               self::throwIdError($post_media->__name,$post_media->__line,'media');
+          }else {
+               self::throwIdError($post_media->__name,$post_media->__line,'post');
           }
      }
@@ -678 +680 @@
                $this->insertPing($ping);
           } else {
-               throw new Exception(__('The backup file does not appear to be well formed.'));
+               self::throwIdError($ping->__name,$ping->__line,'post');
           }
      }
@@ -693 +695 @@
                $this->stack['comment_id']++;
           } else {
-               throw new Exception(__('The backup file does not appear to be well formed.'));
-          }
+               self::throwIdError($comment->__name,$comment->__line,'post');
+          }
+     }
+     
+     private static function throwIdError($name,$line,$related)
+     {
+          throw new Exception(sprintf(
+               __('ID of "%3$s" does not match on record "%1$s" at line %2$s of backup file.'),
+               html::escapeHTML($name),
+               html::escapeHTML($line),
+               html::escapeHTML($related)
+          ));
      }
      

plugins/importExport/locales/fr/main.po

@@ -1 +1 @@
 # Language: Français
-# Module: importExport - 3.0
-# Date: 2012-07-09 12:33:59
+# Module: importExport - 3.1
+# Date: 2012-07-09 14:37:32
 # Translated with translater 1.5
 
@@ -7 +7 @@
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: importExport 3.0\n"
+"Project-Id-Version: importExport 3.1\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-07-09T12:33:59+00:00\n"
+"PO-Revision-Date: 2012-07-09T14:37:32+00:00\n"
 "Last-Translator: Jean-Christian Denis\n"
 "Language-Team: \n"
@@ -308 +308 @@
 msgstr "Tables WordPress non trouvées"
 
-#: inc/flat/class.flat.backup.php:32
+#: inc/flat/class.flat.backup.php:34
 msgid "No file to read."
 msgstr "Aucun fichier lisible."
@@ -324 +324 @@
 msgstr "Le fichier n'est pas un fichier d'export complet."
 
-#: inc/flat/class.flat.import.php:632
-#: inc/flat/class.flat.import.php:642
-#: inc/flat/class.flat.import.php:669
-#: inc/flat/class.flat.import.php:680
-#: inc/flat/class.flat.import.php:695
-msgid "The backup file does not appear to be well formed."
-msgstr "Le fichier de sauvegarde ne semble pas être correctement formaté"
+#: inc/flat/class.flat.import.php:704
+msgid "ID of \"%3$s\" does not match on record \"%1$s\" at line %2$s of backup file."
+msgstr "L'ID de \"%3$s\" ne correspond pas dans l'enregistrement de \"%1$s\" à la ligne %2$s du fichier de sauvegarde."
 
 #: index.php:69