X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=848f3672208e3b34527c7d1a2976fe223cc79aa2;hb=7598c76f1a4989a91003bd4fbd90f30a7c7255ef;hp=32b92eced8576225a525edeadd93ba958c98a1ba;hpb=2cf8341fde67a92369c46d9b12e6d056e5bc5a0e;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 32b92ec..848f367 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1584,9 +1584,10 @@ static void extract_add_sort_string(RecWord *p, const char *str, int length)
     ch = zebraExplain_lookup_attr_str(zei, cat, p->index_type, p->index_name);
     if (ch < 0)
         ch = zebraExplain_add_attr_str(zei, cat, p->index_type, p->index_name);
-    key.len = 2;
+    key.len = 3;
     key.mem[0] = ch;
     key.mem[1] = p->record_id;
+    key.mem[2] = p->section_id;
 
     zebra_rec_keys_write(zh->reg->sortKeys, str, length, &key);
 }
@@ -1874,6 +1875,7 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
             struct sort_add_ent *next;
             WRBUF wrbuf;
             zint sysno;
+            zint section_id;
         };
         struct sort_add_ent *sort_ent_list = 0;
 
@@ -1881,10 +1883,12 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
         {
             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));
@@ -1893,6 +1897,7 @@ void extract_flush_sort_keys(ZebraHandle zh, zint sysno,
                 (*e)->ord = ord;
                 (*e)->cmd = cmd;
                 (*e)->sysno = filter_sysno ? filter_sysno : sysno;
+                (*e)->section_id = section_id;
             }
             
             wrbuf_write((*e)->wrbuf, str, slen);
@@ -1911,9 +1916,9 @@ void extract_flush_sort_keys(ZebraHandle zh, zint 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);
             }
         }