* [perf story #71639] Ignore deleted data.

module/convert/js/importconfluence.ui.js

@@ -54,6 +54,7 @@ function importConfluence(event, url, hide)
             clearInterval(intervalId);
             $('#importResult .dynamicImporting').remove();
             $('#importResult').append("<li class='text-danger my-1'>" + data + '</li>');
+            $('#importResult').append("<li class='text-danger my-1'>" + langImportFailed + '</li>');
         }
     });
     return false;

module/convert/js/importjira.ui.js

@@ -54,6 +54,7 @@ function importJira(event, url, hide)
             clearInterval(intervalId);
             $('#importResult .dynamicImporting').remove();
             $('#importResult').append("<li class='text-danger my-1'>" + data + '</li>');
+            $('#importResult').append("<li class='text-danger my-1'>" + langImportFailed + '</li>');
         }
     });
     return false;

module/convert/lang/zh-cn.php

@@ -106,6 +106,7 @@ $lang->convert->errorGroupExists   = '分组 %s 已存在';
 $lang->convert->errorBuildExists   = 'Build %s 已存在';
 $lang->convert->errorReleaseExists = '发布 %s 已存在';
 $lang->convert->errorCopyFailed    = '文件 %s 拷贝失败';
+$lang->convert->importFailed       = '导入失败';
 
 $lang->convert->setParam = '请设置转换参数';
 

module/convert/model.php

@@ -229,6 +229,8 @@ class convertModel extends model
             if(strtolower($key) != strtolower($fileName)) continue;
             foreach($xmlArray as $key => $attributes)
             {
+                if(is_array($attributes) && isset($attributes['status']) && $attributes['status'] == 'deleted') break;
+
                 if(is_numeric($key))
                 {
                     $desc    = isset($attributes['description']) ? $attributes['description'] : '';
@@ -241,6 +243,8 @@ class convertModel extends model
                     {
                         if(is_array($value))
                         {
+                            if(isset($value['status']) && $value['status'] == 'deleted') break;
+
                             if(!empty($desc))    $value['description'] = $desc;
                             if(!empty($summary)) $value['summary']     = $summary;
                             if(!empty($body))    $value['body']        = $body;
@@ -258,6 +262,8 @@ class convertModel extends model
                 {
                     if(is_array($attributes))
                     {
+                        if(isset($attributes['status']) && $attributes['status'] == 'deleted') continue;
+
                         $dataID = !empty($attributes['id']) ? $attributes['id'] : $key;
                         $dataList[$dataID] = $attributes;
                     }

module/convert/ui/importjira.html.php

@@ -15,6 +15,7 @@ include('jiraside.html.php');
 $importUrl = inlink('importJira', "method={$method}&mode=import&type=user&lastID=0&createTable=true");
 
 jsVar('langImporting', $lang->convert->jira->importingAB);
+jsVar('langImportFailed', $lang->convert->importFailed);
 
 div
 (