Make section_id part of multi-value sort (one sort chunk / section).

[idzebra-moved-to-github.git] / index / extract.c

diff --git a/index/extract.c b/index/extract.c
index e092a9b..82544f5 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1873,17 +1873,21 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
             int cmd;
             struct sort_add_ent *next;
             WRBUF wrbuf;
+            zint sysno;
+            zint section_id;
         };
         struct sort_add_ent *sort_ent_list = 0;
-        zebra_sort_sysno(si, sysno);
 
        while (zebra_rec_keys_read(reckeys, &str, &slen, &key_in))
         {
             int ord = CAST_ZINT_TO_INT(key_in.mem[0]);
+            zint filter_sysno = key_in.mem[1];
+            zint section_id = key_in.mem[2];
 
             struct sort_add_ent **e = &sort_ent_list;
-            while (*e && (*e)->ord != ord)
-                e = &(*e)->next;
+            for (; *e; e = &(*e)->next)
+                if ((*e)->ord == ord && section_id == (*e)->section_id)
+                    break;
             if (!*e)
             {
                 *e = nmem_malloc(nmem, sizeof(**e));
@@ -1891,6 +1895,8 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
                 (*e)->wrbuf = wrbuf_alloc();
                 (*e)->ord = ord;
                 (*e)->cmd = cmd;
+                (*e)->sysno = filter_sysno ? filter_sysno : sysno;
+                (*e)->section_id = section_id;
             }
             
             wrbuf_write((*e)->wrbuf, str, slen);
@@ -1898,14 +1904,20 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
         }
         if (sort_ent_list)
         {
+            zint last_sysno = 0;
             struct sort_add_ent *e = sort_ent_list;
             for (; e; e = e->next)
             {
+                if (last_sysno != e->sysno)
+                {
+                    zebra_sort_sysno(si, e->sysno);
+                    last_sysno = e->sysno;
+                }
                 zebra_sort_type(si, e->ord);
                 if (e->cmd == 1)
-                    zebra_sort_add(si, e->wrbuf);
+                    zebra_sort_add(si, e->section_id, e->wrbuf);
                 else
-                    zebra_sort_delete(si);
+                    zebra_sort_delete(si, e->section_id);
                 wrbuf_destroy(e->wrbuf);
             }
         }