X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frecctrl.h;h=9fe90e74a55e3007b80209e0c890863113bfcc2a;hb=50cca4dc248badf5fc15bfd0e24efc02476e5697;hp=da9faf8f30a034e9810a83bb18cec015a1903eec;hpb=c0c85097014e5b007075ab71d9b5bee412e28dd5;p=idzebra-moved-to-github.git diff --git a/include/recctrl.h b/include/recctrl.h index da9faf8..9fe90e7 100644 --- a/include/recctrl.h +++ b/include/recctrl.h @@ -1,10 +1,29 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recctrl.h,v $ - * Revision 1.19 1997-09-05 15:30:02 adam + * Revision 1.24 1998-03-05 08:38:46 adam + * New member recordSize in recRetrieveCtrl. + * + * Revision 1.23 1998/02/10 12:03:05 adam + * Implemented Sort. + * + * Revision 1.22 1997/10/27 14:33:04 adam + * Moved towards generic character mapping depending on "structure" + * field in abstract syntax file. Fixed a few memory leaks. Fixed + * bug with negative integers when doing searches with relational + * operators. + * + * Revision 1.21 1997/09/18 08:59:19 adam + * Extra generic handle for the character mapping routines. + * + * Revision 1.20 1997/09/17 12:19:10 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.19 1997/09/05 15:30:02 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * @@ -77,34 +96,22 @@ #include #include #include +#include +#include #ifdef __cplusplus extern "C" { #endif -typedef enum { - Word_String, - Word_Phrase, - Word_Numeric -} RecWordType; - /* single word entity */ typedef struct { int attrSet; int attrUse; - RecWordType which; -#if 0 - enum { - Word_String, - Word_Phrase, - Word_Numeric - } which; -#endif - union { - char *string; - int numeric; - } u; - int seqno; + unsigned reg_type; + char *string; + int length; + int seqno; + ZebraMaps zebra_maps; } RecWord; /* Extract record control */ @@ -116,10 +123,11 @@ struct recExtractCtrl { void (*endf)(void *fh, off_t offset); /* end of record position */ off_t offset; /* start offset */ char *subType; - void (*init)(RecWord *p); - void (*add)(const RecWord *p); - const char **(*map_chrs_input)(const char **from, int len); + void (*init)(struct recExtractCtrl *p, RecWord *w); + void (*add)(RecWord *p); + ZebraMaps zebra_maps; int flagShowRecords; + data1_handle dh; }; /* Retrieve record control */ @@ -134,7 +142,9 @@ struct recRetrieveCtrl { Z_RecordComposition *comp; /* formatting instructions */ int localno; /* local id of record */ int score; /* score 0-1000 or -1 if none */ + int recordSize; /* size of record in bytes */ char *subType; + data1_handle dh; /* response */ oid_value output_format;