Changeset 841:e1c6ec0a0736 for plugins/importExport/inc/flat/class.flat.import.php

Timestamp:

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

Author:

JcDenis

Branch:

default

Message:

Flat import errors are now more verbose, fixes #888

File:

• plugins/importExport/inc/flat/class.flat.import.php (modified) (5 diffs)

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)
+          ));
      }