Changeset 1020

Timestamp:

01/11/07 07:04:43 (2 years ago)

Author:

fumiakiy

Message:

Fixed a bug so now the unsuccessful restore correctly results in an error. BugId: 46432

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (4 diffs)
• branches/wheeljack/lib/MT/BackupRestore.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/L10N/ja.pm (modified) (3 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -11247 +11247 @@
-            if ($e) {
-                $result = 0;
-'Required modules (Archive::Tar and/or IO::Uncompress::Gunzip) are missing.'
+$app->translate('Required modules (Archive::Tar and/or IO::Uncompress::Gunzip) are missing.')
-            } else {
-                my $temp_dir = $app->config('TempDir');
@@ -11292 +11292 @@
-            if ($@) {
-                $result = 0;
-'Required module (Archive::Zip) is missing.'
+$app->translate('Required module (Archive::Zip) is missing.')
-            } else {
-                my $temp_dir = $app->config('TempDir');
@@ -11590 +11590 @@
-    my $asset;
-    my @errors;
+    my $error_assets = {};
-    require MT::BackupRestore;
-    if ($is_asset) {
-        $asset = shift @$assets;
-        my $error_assets = {};
-        $asset->{fh} = $fh;
-        MT::BackupRestore->restore_asset(undef, $asset, $objects, $error_assets, sub { $app->print(@_); });
-        if (defined($error_assets->{$asset->{asset_id}})) {
-            $app->log({
-[_1]', $error_assets->{$asset->{asset_id}})
+') . $error_assets->{$asset->{asset_id}}
-                level => MT::Log::WARNING(),
-                class => 'system',
@@ -11636 +11636 @@
-            my $log_url = $app->uri(mode => 'view_log', args => {});
-            $param->{error} = $app->translate('Some objects were not restored because their parent objects were not restored.');
+            $param->{error_url} = $log_url;
+        } elsif (scalar(keys %$error_assets)) {
+            $param->{error} = $app->translate('Some of actual files for assets are not restored correctly.');
+            my $log_url = $app->uri(mode => 'view_log', args => {});
-            $param->{error_url} = $log_url;
-        } else {

branches/wheeljack/lib/MT/BackupRestore.pm

@@ -323 +323 @@
-    if (!-w "$vol$dir") {
-        my $voldir =  "$vol$dir";
-decode_utf8
+utf8_off
-        $errors->{$id} = MT->translate('[_1] is not writable.', MT::I18N::utf8_off($voldir));
-    } else {

branches/wheeljack/lib/MT/L10N/ja.pm

@@ -317 +317 @@
-ƒäž­...\n",
-    "Restoring [_1] (ID: [_2]) was deferred because its parents objects have not been restored yet.\n" => "芪オブゞェクトが芋぀からないため[_1](ID: [_2])の埩å
-
+\n
-    "[_1] [_2] (ID: [_3]) has been restored successfully with new ID: [_4]\n" => "[_2](ID: [_3])が新しくID:[_4]で埩å
-ƒã•ã‚ŒãŸã—た。\n",
@@ -1168 +1168 @@
-    'Please upload [_1] in this page.' => 'このペヌゞでは[_1]をアップロヌドしおください。',
-    'File was not uploaded.' => 'ファむルがアップロヌドされたせんでした。',
-
-
+
+
+
+
-    'Some objects were not restored because their parent objects were not restored.' => '芪オブゞェクトが芋぀からないので埩å
-ƒã§ããªã‹ã£ãŸã‚ªãƒ–ゞェクトがありたす。',
@@ -1178 +1180 @@
-    'Select Weblog' => 'ブログを遞択',
-    'Selected Weblog' => '遞択されたブログ',
-
+
+
+
-    ## lib/MT/Asset.pm
-    'File' => 'ファむル',