X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsafari.c;h=c4398dc5fbb471c17d9ccd6ffc3a6b25af2f80af;hb=a49b6f2fc9cc5208800f0195647f61eb24997812;hp=c070cb061361b3fdcc75cae7a6f969342a6d5015;hpb=852d5f1f9aa0a70f7e54a68143ee86752394a2f2;p=idzebra-moved-to-github.git

diff --git a/index/safari.c b/index/safari.c
index c070cb0..c4398dc 100644
--- a/index/safari.c
+++ b/index/safari.c
@@ -1,5 +1,5 @@
-/* $Id: safari.c,v 1.4 2006-08-22 13:39:28 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: safari.c,v 1.9 2007-04-25 09:38:21 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-
+#include <yaz/oid_db.h>
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
@@ -127,21 +127,25 @@ static int filter_extract(void *clientData, struct recExtractCtrl *p)
     (*p->init)(p, &recWord);
 
     if (!fi_gets(fi, line, sizeof(line)-1))
-	return RECCTRL_EXTRACT_ERROR_GENERIC;
+	return RECCTRL_EXTRACT_EOF;
     sscanf(line, "%255s", p->match_criteria);
     
-    recWord.index_type = '0';
     while (fi_gets(fi, line, sizeof(line)-1))
     {
 	int nor = 0;
 	char field[40];
-	char *cp;
+	const char *cp = line;
 #if 0
 	yaz_log(YLOG_LOG, "safari line: %s", line);
 #endif
+        if (*cp >= '0' && *cp <= '9')
+            recWord.index_type = '0'; /* the default is 0 (raw) */
+        else
+            recWord.index_type = *cp++; /* type given */
+
         if (tinfo->segments)
         {
-            if (sscanf(line, ZINT_FORMAT " " ZINT_FORMAT " " ZINT_FORMAT 
+            if (sscanf(cp, ZINT_FORMAT " " ZINT_FORMAT " " ZINT_FORMAT 
                        ZINT_FORMAT " %39s %n",
                        &recWord.record_id, &recWord.section_id, 
                        &recWord.segment,
@@ -154,7 +158,7 @@ static int filter_extract(void *clientData, struct recExtractCtrl *p)
         }
         else
         {
-            if (sscanf(line, ZINT_FORMAT " " ZINT_FORMAT " " ZINT_FORMAT " %39s %n",
+            if (sscanf(cp, ZINT_FORMAT " " ZINT_FORMAT " " ZINT_FORMAT " %39s %n",
                        &recWord.record_id, &recWord.section_id, &recWord.seqno,
                        field, &nor) < 4)
             {
@@ -162,7 +166,7 @@ static int filter_extract(void *clientData, struct recExtractCtrl *p)
                 return RECCTRL_EXTRACT_ERROR_GENERIC;
             }
         }
-	for (cp = line + nor; *cp == ' '; cp++)
+	for (cp = cp + nor; *cp == ' '; cp++)
 	    ;
 	recWord.index_name = field;
 	recWord.term_buf = cp;
@@ -262,7 +266,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
             filter_ptr = p-filter_buf;
         }
     }
-    p->output_format = VAL_SUTRS;
+    p->output_format = yaz_oid_recsyn_sutrs;
     p->rec_buf = filter_buf;
     p->rec_len = filter_ptr; 
     return 0;