X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzsets.c;h=bb548dcd81553d5cebc8cae13a1c1cbf44c5c8d3;hp=225876c72a63050eee47be89617c75b7d4ef001d;hb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;hpb=b81eb4e30e5febe06da7118cd9a84a63604cb1e0

diff --git a/index/zsets.c b/index/zsets.c
index 225876c..bb548dc 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   Copyright (C) 1994-2009 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -576,8 +576,11 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
                     criteria[i].ord[database_no]);
             zebra_sort_type(zh->reg->sort_index, criteria[i].ord[database_no]);
             wrbuf_rewind(w);
-            if (zebra_sort_read(zh->reg->sort_index, w))
+            if (zebra_sort_read(zh->reg->sort_index, 0, w))
             {
+                /* consider each sort entry and take lowest/highest one
+                   of the one as sorting key depending on whether sort is
+                   ascending/descending */
                 int off = 0;
                 while (off != wrbuf_len(w))
                 {
@@ -586,27 +589,16 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
 
                     if (l >= SORT_IDX_ENTRYSIZE)
                         l = SORT_IDX_ENTRYSIZE-1;
-                    if (off == 0)
+                    if ( (off == 0)
+                         || (criteria[i].relation == 'A'
+                             && strcmp(wrbuf_buf(w)+off, this_entry_buf) < 0)
+                         || (criteria[i].relation == 'D'
+                             && strcmp(wrbuf_buf(w)+off, this_entry_buf) > 0)
+                        )
                     {
                         memcpy(this_entry_buf, wrbuf_buf(w)+off, l);
                         this_entry_buf[l] = '\0';
                     }
-                    else if (criteria[i].relation == 'A')
-                    {
-                        if (strcmp(wrbuf_buf(w)+off, this_entry_buf) < 0)
-                        {
-                            memcpy(this_entry_buf, wrbuf_buf(w)+off, l);
-                            this_entry_buf[l] = '\0';
-                        }
-                    }
-                    else if (criteria[i].relation == 'D')
-                    {
-                        if (strcmp(wrbuf_buf(w)+off, this_entry_buf) > 0)
-                        {
-                            memcpy(this_entry_buf, wrbuf_buf(w)+off, l);
-                            this_entry_buf[l] = '\0';
-                        }
-                    }
                     off += 1 + strlen(wrbuf_buf(w)+off);
                 }
             }
@@ -631,12 +623,6 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset,
                 char this_entry_org[1024];
                 char other_entry_org[1024];
                 double diff;
-                /* when searching multiple databases, we use the index
-                   type of the first one. So if they differ between
-                   databases, we have a problem here we could store the
-                   index_type for each database, but if we didn't find the
-                   record in any sort index, then we still don't know to
-                   which database it belongs. */
                 const char *index_type = criteria[j].index_type;
                 zebra_term_untrans(zh, index_type, this_entry_org,
                                    this_entry_buf);
@@ -1537,6 +1523,7 @@ void zebra_count_set(ZebraHandle zh, RSET rset, zint *count,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab