X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcontrol.c;h=528389980fe2c1ed5bddd7f7ec480e349786b319;hb=bdf0f406d66c4702c3b8942d1bb33a9212283138;hp=4594a907742e2fd9d2613c1bd497f576b9e45178;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/index/kcontrol.c b/index/kcontrol.c
index 4594a90..5283899 100644
--- a/index/kcontrol.c
+++ b/index/kcontrol.c
@@ -1,8 +1,5 @@
-/* $Id: kcontrol.c,v 1.4 2006-08-14 10:40:15 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 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
@@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include "index.h"
 
@@ -56,23 +56,27 @@ static void my_dec(struct rset_key_control *kc)
 
 struct rset_key_control *zebra_key_control_create(ZebraHandle zh)
 {
-    const char *res_val;
     struct rset_key_control *kc = xmalloc(sizeof(*kc));
     struct context_control *cp = xmalloc(sizeof(*cp));
 
     kc->context = cp;
     kc->key_size = sizeof(struct it_key);
-    kc->scope = 2;
-    kc->cmp = key_compare_it;
+    kc->cmp = key_compare;
     kc->key_logdump_txt = key_logdump_txt;
     kc->getseq = key_get_seq;
-    res_val = zebra_get_resource(zh, "segment", 0);
-    kc->get_segment = 0;
-    if (res_val && atoi(res_val))
+
+    if (zh->m_segment_indexing)
     {
+        kc->scope = 3;  /* segment + seq is "same" record */
         kc->get_segment = key_get_segment;
     }
-    zebra_limit_for_rset(zh->m_limit, 
+    else
+    {
+        kc->scope = 2;  /* seq is "same" record */
+        kc->get_segment = 0;
+    }
+
+    zebra_limit_for_rset(zh->m_limit,
 			 &kc->filter_func,
 			 &cp->filter_destroy,
 			 &kc->filter_data);
@@ -85,6 +89,7 @@ struct rset_key_control *zebra_key_control_create(ZebraHandle zh)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab