Don't dump core, when there were no recods indexed due to unknown type
authorpop <pop>
Wed, 26 Feb 2003 12:30:54 +0000 (12:30 +0000)
committerpop <pop>
Wed, 26 Feb 2003 12:30:54 +0000 (12:30 +0000)
index/extract.c

index eb8d161..fb6e228 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.136 2003-02-26 09:13:51 pop Exp $
+/* $Id: extract.c,v 1.137 2003-02-26 12:30:54 pop Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -970,6 +970,14 @@ int bufferExtractRecord (ZebraHandle zh,
        return 0;
     }
 
        return 0;
     }
 
+    zh->reg->keys.buf_used = 0;
+    zh->reg->keys.prevAttrUse = -1;
+    zh->reg->keys.prevAttrSet = -1;
+    zh->reg->keys.prevSeqNo = 0;
+    zh->reg->sortKeys.buf_used = 0;
+    zh->reg->sortKeys.buf_max = 0;
+    zh->reg->sortKeys.buf = 0;
+
     if (*recordType) {
       logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
       recType = recType_byName (zh->reg->recTypes, recordType, subType,
     if (*recordType) {
       logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
       recType = recType_byName (zh->reg->recTypes, recordType, subType,
@@ -990,14 +998,6 @@ int bufferExtractRecord (ZebraHandle zh,
       return 0;
     }
 
       return 0;
     }
 
-    zh->reg->keys.buf_used = 0;
-    zh->reg->keys.prevAttrUse = -1;
-    zh->reg->keys.prevAttrSet = -1;
-    zh->reg->keys.prevSeqNo = 0;
-    zh->reg->sortKeys.buf_used = 0;
-    zh->reg->sortKeys.buf_max = 0;
-    zh->reg->sortKeys.buf = 0;
-
     extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
     extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;