X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=202f7bbf56a6b149411559f97e46e96a428fcd34;hb=7598c76f1a4989a91003bd4fbd90f30a7c7255ef;hp=fd66a248422d47d5dcc8f700de0273860b16a08e;hpb=97a7adeb9e5059463f039495cc01cfa448463a27;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index fd66a24..202f7bb 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -423,6 +423,10 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 	    if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK)
 		ret = ZEBRA_FAIL;
 	}
+        else
+        {
+            zebra_maps_define_default_sort(reg->zebra_maps);
+        }
     }
 
     if (!(reg->records = rec_open(reg->bfs, rw, record_compression)))
@@ -445,6 +449,8 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
         sort_type = ZEBRA_SORT_TYPE_FLAT;
     else if (res_get_match(res, "sortindex", "i", "f"))
         sort_type = ZEBRA_SORT_TYPE_ISAMB;
+    else if (res_get_match(res, "sortindex", "m", "f"))
+        sort_type = ZEBRA_SORT_TYPE_MULTI;
     else
     {
 	yaz_log(YLOG_WARN, "bad_value for 'sortindex'");
@@ -1121,11 +1127,18 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
     }
     else
     {
-	for (i = 0; i<num_recs; i++)
+        WRBUF addinfo_w = wrbuf_alloc();
+	for (i = 0; i < num_recs; i++)
 	{
+            recs[i].errCode = 0;
+            recs[i].errString = 0;
+            recs[i].format = 0;
+            recs[i].len = 0;
+            recs[i].buf = 0;
+            recs[i].base = 0;
+            recs[i].sysno = poset[i].sysno;
 	    if (poset[i].term)
 	    {
-		recs[i].errCode = 0;
 		recs[i].format = yaz_oid_recsyn_sutrs;
 		recs[i].len = strlen(poset[i].term);
 		recs[i].buf = poset[i].term;
@@ -1143,13 +1156,17 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 		zebra_snippets_hit_vector(zh, setname, poset[i].sysno, 
 					  hit_snippet);
 #endif
+                wrbuf_rewind(addinfo_w);
 		recs[i].errCode =
 		    zebra_record_fetch(zh, setname,
                                        poset[i].sysno, poset[i].score,
 				       stream, input_format, comp,
 				       &recs[i].format, &buf, &len,
-				       &recs[i].base, &recs[i].errString);
+				       &recs[i].base, addinfo_w);
 		
+                if (wrbuf_len(addinfo_w))
+                    recs[i].errString =
+                        odr_strdup(stream, wrbuf_cstr(addinfo_w));
 		recs[i].len = len;
 		if (len > 0)
 		{
@@ -1159,7 +1176,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 		else
 		    recs[i].buf = buf;
                 recs[i].score = poset[i].score;
-                recs[i].sysno = poset[i].sysno;
 		zebra_snippets_destroy(hit_snippet);
 	    }
 	    else
@@ -1173,14 +1189,10 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 		    ret = ZEBRA_FAIL;
 		    break;
 		}
-		recs[i].buf = 0;  /* no record and no error issued */
-		recs[i].len = 0;
-		recs[i].errCode = 0;
-		recs[i].format = 0;
-		recs[i].sysno = 0;
 	    }
 	}
 	zebra_meta_records_destroy(zh, poset, num_recs);
+        wrbuf_destroy(addinfo_w);
     }
     zebra_end_read(zh);
     xfree(pos_array);