Changeset 1984

Timestamp:

04/18/08 12:08:50 (22 months ago)

Author:

fumiakiy

Message:

Changed the way to show progress message for MT::Author so the empty message won't overwrite the previous valid messages. BugId:69074

Files:

• branches/release-35/lib/MT/BackupRestore.pm (modified) (4 diffs)

branches/release-35/lib/MT/BackupRestore.pm

@@ -167 +167 @@
     my $counter = 1;
     my $bytes = 0;
-    my %author_ids_seen;
+    my %authors_seen;
+    my $author_pkg = MT->model('author');
     for my $class_hash (@$obj_to_backup) {
         my ($class, $term_arg) = each(%$class_hash);
@@ -217 +218 @@
                 }
                 $count++;
-                if ( ( $class eq MT->model('author') )
-                  && ( exists $author_ids_seen{$object->id} ) ) {
+                if ( ( $class eq $author_pkg )
+                  && ( exists $authors_seen{$object->id} ) ) {
                     next;
                 }
@@ -227 +228 @@
                     $bytes = 0;
                 }
-                if ( $class eq MT->model('author') ) {
+                if ( $class eq $author_pkg ) {
                     # Authors may be duplicated because of how terms and args are created.
-                    $author_ids_seen{$object->id} = 1;
+                    $authors_seen{$object->id} = 1;
                 } elsif ( $class->datasource eq 'asset' ) {
                     $files->{$object->id} = [$object->url, $object->file_path, $object->file_name];
@@ -238 +239 @@
                 if $records && ($records % 100 == 0);
         }
-        if ($records) {
+        if ( $class eq $author_pkg && %authors_seen ) {
+            my $count = scalar(keys %authors_seen);
+            $progress->($state . " " . MT->translate("[_1] records backed up.", $count), $class->class_type || $class->datasource);
+        } elsif ($records) {
             $progress->($state . " " . MT->translate("[_1] records backed up.", $records), $class->class_type || $class->datasource);
         } else {