X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsafari.c;h=7ad9a5ed2750de0e23c707fb0c5853b6494dd93a;hb=e199777080c6fa0963d51b7df1763fd5286ca9a4;hp=4af73f81d357749b4bae0929bf98718680d18fdb;hpb=d2d7564a11bb6f83a77abedbf463bee79a34b778;p=idzebra-moved-to-github.git

diff --git a/index/safari.c b/index/safari.c
index 4af73f8..7ad9a5e 100644
--- a/index/safari.c
+++ b/index/safari.c
@@ -1,4 +1,4 @@
-/* $Id: safari.c,v 1.8 2007-04-25 08:18:01 adam Exp $
+/* $Id: safari.c,v 1.10 2007-10-29 16:57:53 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -130,18 +130,26 @@ static int filter_extract(void *clientData, struct recExtractCtrl *p)
 	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;
+        char type_cstr[2];
 #if 0
 	yaz_log(YLOG_LOG, "safari line: %s", line);
 #endif
+        type_cstr[1] = '\0';
+        if (*cp >= '0' && *cp <= '9')
+            type_cstr[0] = '0'; /* the default is 0 (raw) */
+        else
+            type_cstr[0] = *cp++; /* type given */
+        type_cstr[1] = '\0';
+
+        recWord.index_type = type_cstr;
         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 +162,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 +170,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;