From f10e05b7ee8133983a10040e7c4cb924644de9a3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 21 May 2024 19:20:07 +0800
Subject: [PATCH] update

---
 plugins/sphinx/index.py     | 33 +++++++++++++++++++++++++--------
 plugins/sphinx/js/sphinx.js | 22 ++++++++++++----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/plugins/sphinx/index.py b/plugins/sphinx/index.py
index c213fa60d..88c410ca0 100755
--- a/plugins/sphinx/index.py
+++ b/plugins/sphinx/index.py
@@ -295,18 +295,35 @@ def sphinxConfParse():
     sindex = re.findall(rep, content)
     indexlen = len(sindex)
     cmd = {}
+    cmd['cmd'] = bin_dir + '/bin/bin/indexer -c ' + bin_dir + '/sphinx.conf'
+
+    cmd['index'] = []
+    cmd_index = []
+    cmd_delta = []
     if indexlen > 0:
-        cmd_index = []
-        cmd_delta = []
         for x in range(indexlen):
-            if sindex[x].find(':') != -1:
-                cmd_delta.append(sindex[x])
+            name = sindex[x].strip()
+            if name == '':
+                continue
+            if  name.find(':') != -1:
+                cmd_delta.append(name.strip())
             else:
-                cmd_index.append(sindex[x])
+                cmd_index.append(name.strip())
+
+    # print(cmd_index)
+    # print(cmd_delta)
+
+    for ci in cmd_index:
+        val = {}
+        val['index'] = ci
+
+        for cd in cmd_delta:
+            cd = cd.replace(" ", '')
+            if cd.find(":"+ci) > -1:
+                val['delta'] = cd.split(":")[0].strip()
+                break
 
-        cmd['index'] = cmd_index
-        cmd['delta'] = cmd_delta
-        cmd['cmd'] = bin_dir + '/bin/bin/indexer -c ' + bin_dir + '/sphinx.conf'
+        cmd['index'].append(val)
     return cmd
 
 
diff --git a/plugins/sphinx/js/sphinx.js b/plugins/sphinx/js/sphinx.js
index f78608230..7cc7ce4f3 100755
--- a/plugins/sphinx/js/sphinx.js
+++ b/plugins/sphinx/js/sphinx.js
@@ -280,22 +280,24 @@ function readme(){
             return;
         }
 
+        // console.log(rdata['data']);
         var con = '<ul class="help-info-text c7">';
 
         con += '<li style="color:red;">如果数据量比较大,第一次启动会失败!(可通过手动建立索引)</li>';
         con += '<li style="color:red;">以下内容,需手动加入计划任务。</li>';
+            
+
+        con += '<li>全量:' + rdata['data']['cmd'] + ' --all --rotate</li>';
+
         //主索引
         for (var i = 0; i < rdata['data']['index'].length; i++) {
-            var index_t = rdata['data']['index'][i];
-            con += '<li>主索引:' + rdata['data']['cmd'] + ' '+ index_t +' --rotate</li>';
-        }
-
-        for (var i = 0; i < rdata['data']['delta'].length; i++) {
-            var delta_t = rdata['data']['delta'][i];
-            var list = delta_t.split(':');
-            // console.log(list);
-            con += '<li>增量索引:' + rdata['data']['cmd'] + ' '+ list[0] +' --rotate</li>';
-            con += '<li>合并索引:' + rdata['data']['cmd'] + ' --merge '+ list[1] + ' ' + list[0] +' --rotate</li>';
+            var index_kv = rdata['data']['index'][i];
+            var index = index_kv['index'];
+            var delta = index_kv['delta'];
+            // console.log(index,delta);
+            con += '<li>主索引 :' + rdata['data']['cmd'] + ' '+ index +' --rotate</li>';
+            con += '<li>增量索引 :' + rdata['data']['cmd'] + ' '+ delta +' --rotate</li>';
+            con += '<li>合并索引 :' + rdata['data']['cmd'] + ' --merge '+ delta + ' ' + index +' --rotate</li>';
         }
         con += '</ul>';