X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=e9eeea12347198e94a020f4d375da3bb14adddf8;hb=d8e960f5f1060148a5fffa7a767c72391662fbdc;hp=4788742864fb20e8c3ff7cfa578c5776a0866278;hpb=5dd30bc682bf1338ed6beb1a485ccde86b06cc5a;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 4788742..e9eeea1 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,4 +1,4 @@
-/* $Id: zrpn.c,v 1.188 2005-05-03 14:04:31 adam Exp $
+/* $Id: zrpn.c,v 1.190 2005-05-09 13:24:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -2007,11 +2007,8 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     int i;
     int sort_relation_value;
     AttrType sort_relation_type;
-    int use_value;
-    AttrType use_type;
     Z_SortKeySpec *sks;
     Z_SortKey *sk;
-    Z_AttributeElement *ae;
     int oid[OID_SIZE];
     oident oe;
     char termz[20];
@@ -2019,9 +2016,6 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     attr_init(&sort_relation_type, zapt, 7);
     sort_relation_value = attr_find(&sort_relation_type, &attributeSet);
 
-    attr_init(&use_type, zapt, 1);
-    use_value = attr_find(&use_type, &attributeSet);
-
     if (!sort_sequence->specs)
     {
         sort_sequence->num_specs = 10;
@@ -2057,21 +2051,7 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
         nmem_malloc(stream, sizeof(*sk->u.sortAttributes));
 
     sk->u.sortAttributes->id = oid;
-    sk->u.sortAttributes->list = (Z_AttributeList *)
-        nmem_malloc(stream, sizeof(*sk->u.sortAttributes->list));
-    sk->u.sortAttributes->list->num_attributes = 1;
-    sk->u.sortAttributes->list->attributes = (Z_AttributeElement **)
-        nmem_malloc(stream, sizeof(*sk->u.sortAttributes->list->attributes));
-    ae = *sk->u.sortAttributes->list->attributes = (Z_AttributeElement *)
-        nmem_malloc(stream, sizeof(**sk->u.sortAttributes->list->attributes));
-    ae->attributeSet = 0;
-    ae->attributeType = (int *)
-        nmem_malloc(stream, sizeof(*ae->attributeType));
-    *ae->attributeType = 1;
-    ae->which = Z_AttributeValue_numeric;
-    ae->value.numeric = (int *)
-        nmem_malloc(stream, sizeof(*ae->value.numeric));
-    *ae->value.numeric = use_value;
+    sk->u.sortAttributes->list = zapt->attributes;
 
     sks->sortRelation = (int *)
         nmem_malloc(stream, sizeof(*sks->sortRelation));
@@ -2441,15 +2421,16 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
 	for (i = 0; i<num_result_sets; i++)
 	    rset_delete(result_sets[i]);
 	*result_set = 0;
-	return res;
     }
-    assert(num_result_sets == 1);
-    assert(result_sets);
-    assert(*result_sets);
-    *result_set = *result_sets;
-
+    else
+    {
+	assert(num_result_sets == 1);
+	assert(result_sets);
+	assert(*result_sets);
+	*result_set = *result_sets;
+    }
     (*kc->dec)(kc);
-    return ZEBRA_OK;
+    return res;
 }
 
 ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,