X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fidzebra%2Fdata1.h;h=5d2ffdca9fa04e7da2b3a60beb4fc118fcbfb447;hp=6596cb63735ee602cda1fd8ab8915156f8d357dc;hb=ca820b5e84bec416bf0f5790d1aac509842b4faf;hpb=975930cb88b6d7b8a280f7d995d10bd988b6f04e diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h index 6596cb6..5d2ffdc 100644 --- a/include/idzebra/data1.h +++ b/include/idzebra/data1.h @@ -1,6 +1,6 @@ -/* $Id: data1.h,v 1.2 2004-09-28 10:43:37 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: data1.h,v 1.24 2007-06-27 22:04:45 adam Exp $ + Copyright (C) 1995-2007 + Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #ifndef DATA1_H @@ -26,12 +26,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include #include - -#include #include -#include + +#include #define d1_isspace(c) strchr(" \r\n\t\f", c) #define d1_isdigit(c) ((c) <= '9' && (c) >= '0') @@ -53,12 +51,6 @@ YAZ_BEGIN_CDECL struct data1_attset; -typedef struct data1_local_attribute -{ - int local; - struct data1_local_attribute *next; -} data1_local_attribute; - typedef struct data1_attset data1_attset; typedef struct data1_att data1_att; typedef struct data1_attset_child data1_attset_child; @@ -68,7 +60,6 @@ struct data1_att data1_attset *parent; /* attribute set */ char *name; /* symbolic name of this attribute */ int value; /* attribute value */ - data1_local_attribute *locals; /* local index values */ data1_att *next; }; @@ -80,7 +71,7 @@ struct data1_attset_child { struct data1_attset { char *name; /* symbolic name */ - oid_value reference; /* external ID of attset */ + Odr_oid *oid; /* attribute set OID */ data1_att *atts; /* attributes */ data1_attset_child *children; /* included attset */ data1_attset *next; /* next in cache */ @@ -89,7 +80,7 @@ struct data1_attset typedef struct data1_handle_info *data1_handle; YAZ_EXPORT data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, - char *name); + const char *name); YAZ_EXPORT data1_attset *data1_read_attset(data1_handle dh, const char *file); YAZ_EXPORT data1_attset *data1_empty_attset(data1_handle dh); @@ -120,7 +111,7 @@ typedef struct data1_mapunit typedef struct data1_maptab { char *name; - oid_value target_absyn_ref; + Odr_oid *oid; /* target abstract syntax */ char *target_absyn_name; data1_mapunit *map; struct data1_maptab *next; @@ -154,7 +145,7 @@ typedef enum data1_datatype typedef struct data1_marctab { char *name; - oid_value reference; + Odr_oid *oid; /* MARC OID */ char record_status[2]; char implementation_codes[5]; @@ -205,7 +196,7 @@ typedef struct data1_varclass typedef struct data1_varset { char *name; - oid_value reference; + Odr_oid *oid; /* variant OID */ data1_varclass *classes; } data1_varset; @@ -238,7 +229,7 @@ struct data1_tagset { int type; /* type of tagset in current context */ char *name; /* symbolic name */ - oid_value reference; + Odr_oid *oid; /* variant OID */ data1_tag *tags; /* tags defined by this set */ data1_tagset *children; /* children */ data1_tagset *next; /* sibling */ @@ -246,7 +237,7 @@ struct data1_tagset typedef struct data1_termlist { - data1_att *att; + char *index_name; char *structure; char *source; struct data1_termlist *next; @@ -264,6 +255,7 @@ typedef struct data1_element char *sub_name; struct data1_element *children; struct data1_element *next; + struct data1_hash_table *hash; } data1_element; typedef struct data1_sub_elements { @@ -351,7 +343,6 @@ typedef struct data1_node } preprocess; } u; - void (*destroy)(struct data1_node *n); #define DATA1_LOCALDATA 12 char lbuf[DATA1_LOCALDATA]; /* small buffer for local data */ struct data1_node *next; @@ -361,10 +352,13 @@ typedef struct data1_node struct data1_node *root; } data1_node; +enum DATA1_XPATH_INDEXING { + DATA1_XPATH_INDEXING_DISABLE, + DATA1_XPATH_INDEXING_ENABLE +}; + YAZ_EXPORT data1_handle data1_create (void); -#define DATA1_FLAG_XML 1 -YAZ_EXPORT data1_handle data1_createx (int flags); YAZ_EXPORT void data1_destroy(data1_handle dh); YAZ_EXPORT data1_node *get_parent_tag(data1_handle dh, data1_node *n); @@ -376,8 +370,9 @@ YAZ_EXPORT data1_node *data1_read_nodex (data1_handle dh, NMEM m, YAZ_EXPORT data1_node *data1_read_record(data1_handle dh, int (*rf)(void *, char *, size_t), void *fh, NMEM m); -YAZ_EXPORT data1_absyn *data1_read_absyn(data1_handle dh, const char *file, - int file_must_exist); + +YAZ_EXPORT void data1_remove_node (data1_handle dh, data1_node *n); +YAZ_EXPORT void data1_remove_idzebra_subtree (data1_handle dh, data1_node *n); YAZ_EXPORT data1_tag *data1_gettagbynum(data1_handle dh, data1_tagset *s, int type, int value); @@ -394,7 +389,6 @@ YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n, int *len); YAZ_EXPORT data1_tag *data1_gettagbyname(data1_handle dh, data1_tagset *s, const char *name); -YAZ_EXPORT void data1_free_tree(data1_handle dh, data1_node *t); YAZ_EXPORT char *data1_nodetobuf(data1_handle dh, data1_node *n, int select, int *len); YAZ_EXPORT data1_node *data1_mk_tag_data_wd(data1_handle dh, @@ -406,7 +400,8 @@ YAZ_EXPORT data1_datatype data1_maptype(data1_handle dh, char *t); YAZ_EXPORT data1_varset *data1_read_varset(data1_handle dh, const char *file); YAZ_EXPORT data1_vartype *data1_getvartypebyct(data1_handle dh, data1_varset *set, - char *zclass, char *type); + const char *zclass, + const char *type); YAZ_EXPORT data1_vartype *data1_getvartypeby_absyn(data1_handle dh, data1_absyn *absyn, char *zclass, char *type); @@ -492,7 +487,8 @@ YAZ_EXPORT data1_node *data1_mk_tag_data_text_uni (data1_handle dh, const char *str, NMEM nmem); -YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name); +YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name, + enum DATA1_XPATH_INDEXING en); YAZ_EXPORT data1_node *data1_search_tag (data1_handle dh, data1_node *n, const char *tag); @@ -505,9 +501,9 @@ YAZ_EXPORT data1_node *data1_map_record(data1_handle dh, data1_node *n, YAZ_EXPORT data1_marctab *data1_read_marctab (data1_handle dh, const char *file); YAZ_EXPORT data1_marctab *data1_absyn_getmarctab(data1_handle dh, - data1_absyn *absyn); + data1_node *root); YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh, - data1_absyn *absyn); + data1_node *root); YAZ_EXPORT char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n, int selected, int *len); YAZ_EXPORT char *data1_nodetoidsgml(data1_handle dh, data1_node *n, @@ -545,7 +541,8 @@ YAZ_EXPORT void data1_absyn_trav (data1_handle dh, void *handle, void (*fh)(data1_handle dh, void *h, data1_absyn *a)); -YAZ_EXPORT data1_attset *data1_attset_search_id (data1_handle dh, int id); +YAZ_EXPORT data1_attset *data1_attset_search_id (data1_handle dh, + const Odr_oid *oid); YAZ_EXPORT char *data1_getNodeValue(data1_node* node, char* pTagPath); YAZ_EXPORT data1_node *data1_LookupNode(data1_node* node, char* pTagPath); @@ -581,9 +578,20 @@ YAZ_EXPORT const char *data1_systag_lookup(data1_absyn *absyn, const char *tag, const char *default_value); YAZ_EXPORT void data1_concat_text(data1_handle dh, NMEM m, data1_node *n); +YAZ_EXPORT void data1_chop_text(data1_handle dh, NMEM m, data1_node *n); YAZ_EXPORT void data1_absyn_destroy(data1_handle dh); +YAZ_EXPORT const char *data1_absyn_get_staticrank(data1_absyn *absyn); + YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +