X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=8b4ae2266e58ed918f53f98da2f5bbc6888092bf;hb=819a419fefe487a23624e5f94b6a20b342ce2de8;hp=107b4cae0f11320402951e472a8d7b6c33650083;hpb=cef013b96c9508d5fd8552e7fd05962029b37e6f;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index 107b4ca..8b4ae22 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.162 2004-09-15 08:13:51 adam Exp $
+/* $Id: extract.c,v 1.165 2004-10-04 09:27:48 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -400,10 +400,9 @@ static int file_extract_record(ZebraHandle zh,
     off_t recordOffset = 0;
     RecType recType;
     void *clientData;
-    char subType[128];
     
     if (!(recType =
-	  recType_byName (zh->reg->recTypes, zh->m_record_type, subType,
+	  recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type,
 			  &clientData)))
     {
         logf (LOG_WARN, "No such record type: %s", zh->m_record_type);
@@ -436,7 +435,6 @@ static int file_extract_record(ZebraHandle zh,
 	extractCtrl.tellf = file_tell;
 	extractCtrl.endf = file_end;
 	extractCtrl.fh = fi;
-	extractCtrl.subType = subType;
 	extractCtrl.init = extract_init;
 	extractCtrl.tokenAdd = extract_token_add;
 	extractCtrl.schemaAdd = extract_schema_add;
@@ -496,8 +494,9 @@ static int file_extract_record(ZebraHandle zh,
             if (!zh->m_flag_rw)
                 return 1;
 	    
-	    logf (LOG_WARN, "empty %s %s " PRINTF_OFF_T, zh->m_record_type,
-		  fname, recordOffset);
+	    if (zh->records_processed < zh->m_file_verbose_limit)
+	        logf (LOG_WARN, "empty %s %s " PRINTF_OFF_T, zh->m_record_type,
+		    fname, recordOffset);
             return 1;
         }
     }
@@ -824,7 +823,6 @@ int buffer_extract_record (ZebraHandle zh,
     int i, r;
     const char *matchStr = 0;
     RecType recType = NULL;
-    char subType[1024];
     void *clientData;
     Record rec;
     long recordOffset = 0;
@@ -861,7 +859,7 @@ int buffer_extract_record (ZebraHandle zh,
     
     if (recordType && *recordType) {
         logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
-        recType = recType_byName (zh->reg->recTypes, recordType, subType,
+        recType = recType_byName (zh->reg->recTypes, zh->res, recordType,
                                   &clientData);
     } else {
         if (!(zh->m_record_type)) {
@@ -869,8 +867,8 @@ int buffer_extract_record (ZebraHandle zh,
             return 0;
         }
         logf (LOG_DEBUG, "Get record type from rgroup: %s",zh->m_record_type);
-        recType = recType_byName (zh->reg->recTypes, zh->m_record_type, subType,
-                                  &clientData);
+        recType = recType_byName (zh->reg->recTypes, zh->res,
+				  zh->m_record_type, &clientData);
         recordType = zh->m_record_type;
     }
     
@@ -879,7 +877,6 @@ int buffer_extract_record (ZebraHandle zh,
         return 0;
     }
     
-    extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
     extractCtrl.schemaAdd = extract_schema_add;
@@ -1546,7 +1543,7 @@ static void extract_add_complete_field (RecWord *p)
     int i = 0, remain = p->length;
     int first; /* first position */
 
-yaz_log(LOG_DEBUG, "Complete field, w='%s'", p->string);
+yaz_log(LOG_DEBUG, "Complete field, w='%.*s'", p->length, p->string);
 
     if (remain > 0)
 	map = zebra_maps_input (p->zebra_maps, p->reg_type, &b, remain, 1);