-/* $Id: d1_absyn.c,v 1.11 2004-08-24 14:29:09 adam Exp $
+/* $Id: d1_absyn.c,v 1.12 2004-09-28 10:15:02 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/oid.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
#include <zebra_xpath.h>
+#include <d1_absyn.h>
#define D1_MAX_NESTING 128
+#if PRIVATE_DATA1_ABSYN
+#endif
+
struct data1_systag {
char *name;
char *value;
return argc;
}
+data1_marctab *data1_absyn_getmarctab(data1_handle dh, data1_absyn *absyn)
+{
+ return absyn->marc;
+}
+
+YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh,
+ data1_absyn *absyn)
+{
+ return absyn->main_elements;
+}
data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
int file_must_exist)
-/* $Id: d1_attset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_attset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/log.h>
#include <d1_attset.h>
-#include <data1.h>
+#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
{
-/* $Id: d1_doespec.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_doespec.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/oid.h>
#include <yaz/log.h>
#include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
static int match_children(data1_handle dh, data1_node *n,
Z_Espec1 *e, int i, Z_ETagUnit **t,
-/* $Id: d1_espec.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_espec.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/odr.h>
#include <yaz/proto.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
const char *file, int lineno)
-/* $Id: d1_expout.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_expout.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/log.h>
#include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
typedef struct {
data1_handle dh;
-/* $Id: d1_grs.c,v 1.3 2003-03-27 21:57:01 adam Exp $
+/* $Id: d1_grs.c,v 1.4 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/proto.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
#define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
-/* $Id: d1_handle.c,v 1.3 2002-12-16 20:27:18 adam Exp $
+/* $Id: d1_handle.c,v 1.4 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
struct data1_handle_info {
WRBUF wrbuf;
-/* $Id: d1_if.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_if.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <string.h>
-#include <data1.h>
+#include <idzebra/data1.h>
#include <yaz/log.h>
#include <string.h>
-
/*
* Search for a token in the supplied string up to the supplied list of stop characters or EOL
* At the end, return the character causing the break and fill pTokenBuffer with the token string so far
-/* $Id: d1_map.c,v 1.3 2003-03-27 21:57:01 adam Exp $
+/* $Id: d1_map.c,v 1.4 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/log.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
-#include <data1.h>
+#include <d1_absyn.h>
#include <d1_map.h>
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
-/* $Id: d1_marc.c,v 1.6 2003-12-17 12:03:54 adam Exp $
+/* $Id: d1_marc.c,v 1.7 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
#include <yaz/tpath.h>
-#include <data1.h>
+#include <idzebra/data1.h>
data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
{
-/* $Id: d1_prtree.c,v 1.3 2003-09-08 10:26:26 adam Exp $
+/* $Id: d1_prtree.c,v 1.4 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
*/
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
static void pr_string (FILE *out, const char *str, int len)
{
-/* $Id: d1_read.c,v 1.9 2004-08-04 08:35:22 adam Exp $
+/* $Id: d1_read.c,v 1.10 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/xmalloc.h>
#include <yaz/yaz-util.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
{
-/* $Id: d1_soif.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_soif.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
*/
#include <yaz/wrbuf.h>
-#include <data1.h>
+#include <idzebra/data1.h>
static int nodetoelement(data1_node *n, int select, char *prefix, WRBUF b)
{
-/* $Id: d1_sumout.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_sumout.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/log.h>
#include <yaz/proto.h>
-#include <data1.h>
+#include <idzebra/data1.h>
static int *f_integer(data1_node *c, ODR o)
{
-/* $Id: d1_sutrs.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_sutrs.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
/* converts data1 tree to SUTRS record */
-#include <data1.h>
+#include <idzebra/data1.h>
#define NTOBUF_INDENT 2
#define NTOBUF_MARGIN 75
-/* $Id: d1_tagset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_tagset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
/*
* We'll probably want to add some sort of hashed index to these lookup-
-/* $Id: d1_varset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_varset.c,v 1.3 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/oid.h>
#include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
char *zclass, char *type)
return 0;
}
+data1_vartype *data1_getvartypeby_absyn (data1_handle dh, data1_absyn *absyn,
+ char *zclass, char *type)
+{
+ return data1_getvartypebyct(dh, absyn->varset, zclass, type);
+}
+
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
-/* $Id: d1_write.c,v 1.3 2003-02-25 21:50:27 adam Exp $
+/* $Id: d1_write.c,v 1.4 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
-#include <data1.h>
+#include <idzebra/data1.h>
#include <yaz/wrbuf.h>
#define IDSGML_MARGIN 75
-# $Id: Makefile.am,v 1.14 2004-09-01 17:08:45 adam Exp $
+# $Id: Makefile.am,v 1.15 2004-09-28 10:15:03 adam Exp $
noinst_HEADERS = bfile.h bset.h charmap.h d1_attset.h d1_map.h \
-data1.h dfa.h dict.h direntz.h isam-codec.h isamb.h isamc.h isamg.h \
-isams.h mfile.h passwddb.h recctrl.h \
-rset.h set.h sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h \
-zebra_xpath.h
+dict.h direntz.h isam-codec.h isamb.h isamc.h isamg.h \
+isams.h mfile.h passwddb.h dfa.h zebra_xpath.h d1_absyn.h \
+rset.h set.h sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h
SUBDIRS = idzebra
--- /dev/null
+
+#ifndef D1_ABSYN_H
+#define D1_ABSYN_H 1
+
+#define ENHANCED_XELM 1
+
+#include <zebra_xpath.h>
+#include <idzebra/data1.h>
+#include <dfa.h>
+
+typedef struct data1_xpelement
+{
+ char *xpath_expr;
+#ifdef ENHANCED_XELM
+ struct xpath_location_step xpath[XPATH_STEP_COUNT];
+ int xpath_len;
+#endif
+ struct DFA *dfa;
+ data1_termlist *termlists;
+ struct data1_xpelement *next;
+} data1_xpelement;
+
+struct data1_absyn
+{
+ char *name;
+ oid_value reference;
+ data1_tagset *tagset;
+ data1_attset *attset;
+ data1_varset *varset;
+ data1_esetname *esetnames;
+ data1_maptab *maptabs;
+ data1_marctab *marc;
+ data1_sub_elements *sub_elements;
+ data1_element *main_elements;
+ struct data1_xpelement *xp_elements; /* pop */
+ struct data1_systag *systags;
+ char *encoding;
+ int enable_xpath_indexing;
+};
+
+#endif
+++ /dev/null
-/* $Id: data1.h,v 1.11 2004-08-25 09:23:35 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
-
-This file is part of the Zebra server.
-
-Zebra is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-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.
-*/
-
-#ifndef DATA1_H
-#define DATA1_H
-
-#define ENHANCED_XELM 1
-
-#include <stdio.h>
-
-#include <yaz/nmem.h>
-#include <yaz/oid.h>
-#include <yaz/proto.h>
-
-#include <idzebra/version.h>
-#include <d1_attset.h>
-#include <d1_map.h>
-#include <yaz/yaz-util.h>
-#include <yaz/wrbuf.h>
-#include <dfa.h> /* pop */
-#include <zebra_xpath.h> /* pop */
-
-#define d1_isspace(c) strchr(" \r\n\t\f", c)
-#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
-
-YAZ_BEGIN_CDECL
-
-#define data1_matchstr(s1, s2) yaz_matchstr(s1, s2)
-
-#define DATA1_MAX_SYMBOL 31
-
-typedef struct data1_name
-{
- char *name;
- struct data1_name *next;
-} data1_name;
-
-typedef struct data1_absyn_cache_info *data1_absyn_cache;
-typedef struct data1_attset_cache_info *data1_attset_cache;
-
-typedef enum data1_datatype
-{
- DATA1K_unknown,
- DATA1K_structured,
- DATA1K_string,
- DATA1K_numeric,
- DATA1K_bool,
- DATA1K_oid,
- DATA1K_generalizedtime,
- DATA1K_intunit,
- DATA1K_int,
- DATA1K_octetstring,
- DATA1K_null
-} data1_datatype;
-
-typedef struct data1_marctab
-{
- char *name;
- oid_value reference;
-
- char record_status[2];
- char implementation_codes[5];
- int indicator_length;
- int identifier_length;
- char user_systems[4];
-
- int length_data_entry;
- int length_starting;
- int length_implementation;
- char future_use[2];
-
- int force_indicator_length;
- int force_identifier_length;
- char leader[24]; /* Fixme! Need linear access to LEADER of MARC record */
- struct data1_marctab *next;
-} data1_marctab;
-
-typedef struct data1_esetname
-{
- char *name;
- Z_Espec1 *spec;
- struct data1_esetname *next;
-} data1_esetname;
-
-/*
- * Variant set definitions.
- */
-
-typedef struct data1_vartype
-{
- char *name;
- struct data1_varclass *zclass;
- int type;
- data1_datatype datatype;
- struct data1_vartype *next;
-} data1_vartype;
-
-typedef struct data1_varclass
-{
- char *name;
- struct data1_varset *set;
- int zclass;
- data1_vartype *types;
- struct data1_varclass *next;
-} data1_varclass;
-
-typedef struct data1_varset
-{
- char *name;
- oid_value reference;
- data1_varclass *classes;
-} data1_varset;
-
-/*
- * Tagset definitions
- */
-
-struct data1_tagset;
-
-typedef struct data1_tag
-{
- data1_name *names;
-#define DATA1T_numeric 1
-#define DATA1T_string 2
- int which;
- union
- {
- int numeric;
- char *string;
- } value;
- data1_datatype kind;
-
- struct data1_tagset *tagset;
- struct data1_tag *next;
-} data1_tag;
-
-typedef struct data1_tagset data1_tagset;
-
-struct data1_tagset
-{
- int type; /* type of tagset in current context */
- char *name; /* symbolic name */
- oid_value reference;
- data1_tag *tags; /* tags defined by this set */
- data1_tagset *children; /* children */
- data1_tagset *next; /* sibling */
-};
-
-typedef struct data1_termlist
-{
- data1_att *att;
- char *structure;
- char *source;
- struct data1_termlist *next;
-} data1_termlist;
-
-/*
- * abstract syntax specification
- */
-
-typedef struct data1_element
-{
- char *name;
- data1_tag *tag;
- data1_termlist *termlists;
- char *sub_name;
- struct data1_element *children;
- struct data1_element *next;
-} data1_element;
-
-typedef struct data1_sub_elements {
- char *name;
- struct data1_sub_elements *next;
- data1_element *elements;
-} data1_sub_elements;
-
-/* pop */
-typedef struct data1_xpelement
-{
- char *xpath_expr;
-#ifdef ENHANCED_XELM
- struct xpath_location_step xpath[XPATH_STEP_COUNT];
- int xpath_len;
-#endif
- struct DFA *dfa;
- data1_termlist *termlists;
- struct data1_xpelement *next;
-} data1_xpelement;
-
-typedef struct data1_xattr {
- char *name;
- char *value;
- struct data1_xattr *next;
- unsigned short what; /* DATA1I_text, .. see data1_node.u.data */
-} data1_xattr;
-
-#if 0
-typedef struct data1_absyn data1_absyn;
-#else
-typedef struct data1_absyn
-{
- char *name;
- oid_value reference;
- data1_tagset *tagset;
- data1_attset *attset;
- data1_varset *varset;
- data1_esetname *esetnames;
- data1_maptab *maptabs;
- data1_marctab *marc;
- data1_sub_elements *sub_elements;
- data1_element *main_elements;
- data1_xpelement *xp_elements; /* pop */
- struct data1_systag *systags;
- char *encoding;
- int enable_xpath_indexing;
-} data1_absyn;
-#endif
-/*
- * record data node (tag/data/variant)
- */
-
-typedef struct data1_node
-{
- /* the root of a record (containing global data) */
-#define DATA1N_root 1
- /* a tag */
-#define DATA1N_tag 2
- /* some data under a leaf tag or variant */
-#define DATA1N_data 3
- /* variant specification (a triple, actually) */
-#define DATA1N_variant 4
- /* comment (same as data) */
-#define DATA1N_comment 5
- /* preprocessing instruction */
-#define DATA1N_preprocess 6
- int which;
- union
- {
- struct
- {
- char *type;
- data1_absyn *absyn; /* abstract syntax for this type */
- } root;
-
- struct
- {
- char *tag;
- data1_element *element;
- int no_data_requested;
- int get_bytes;
- unsigned node_selected : 1;
- unsigned make_variantlist : 1;
- data1_xattr *attributes;
- } tag;
-
- struct
- {
- char *data; /* filename or data */
- int len;
- /* text inclusion */
-#define DATA1I_inctxt 1
- /* binary data inclusion */
-#define DATA1I_incbin 2
- /* text data */
-#define DATA1I_text 3
- /* numerical data */
-#define DATA1I_num 4
- /* object identifier */
-#define DATA1I_oid 5
- /* XML text */
-#define DATA1I_xmltext 6
- unsigned what:7;
- unsigned formatted_text : 1; /* newlines are significant */
- } data;
-
- struct
- {
- data1_vartype *type;
- char *value;
- } variant;
-
- struct
- {
- char *target;
- data1_xattr *attributes;
- } 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;
- struct data1_node *child;
- struct data1_node *last_child;
- struct data1_node *parent;
- struct data1_node *root;
-} data1_node;
-
-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);
-YAZ_EXPORT data1_node *data1_read_node(data1_handle dh, const char **buf,
- NMEM m);
-YAZ_EXPORT data1_node *data1_read_nodex (data1_handle dh, NMEM m,
- int (*get_byte)(void *fh), void *fh,
- WRBUF wrbuf);
-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 data1_tag *data1_gettagbynum(data1_handle dh,
- data1_tagset *s,
- int type, int value);
-YAZ_EXPORT data1_tagset *data1_empty_tagset (data1_handle dh);
-YAZ_EXPORT data1_tagset *data1_read_tagset(data1_handle dh,
- const char *file,
- int type);
-YAZ_EXPORT data1_element *data1_getelementbytagname(data1_handle dh,
- data1_absyn *abs,
- data1_element *parent,
- const char *tagname);
-YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
- int select, ODR o,
- 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,
- data1_node *at,
- const char *tagname, NMEM m);
-YAZ_EXPORT data1_node *data1_mk_tag_data(data1_handle dh, data1_node *at,
- const char *tagname, NMEM m);
-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);
-YAZ_EXPORT Z_Espec1 *data1_read_espec1(data1_handle dh, const char *file);
-YAZ_EXPORT int data1_doespec1(data1_handle dh, data1_node *n, Z_Espec1 *e);
-YAZ_EXPORT data1_esetname *data1_getesetbyname(data1_handle dh,
- data1_absyn *a,
- const char *name);
-YAZ_EXPORT data1_element *data1_getelementbyname(data1_handle dh,
- data1_absyn *absyn,
- const char *name);
-YAZ_EXPORT data1_node *data1_mk_node2(data1_handle dh, NMEM m,
- int type, data1_node *parent);
-
-YAZ_EXPORT data1_node *data1_mk_tag (data1_handle dh, NMEM nmem,
- const char *tag, const char **attr,
- data1_node *at);
-YAZ_EXPORT data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
- const char *tag, size_t len,
- const char **attr,
- data1_node *at);
-YAZ_EXPORT void data1_tag_add_attr (data1_handle dh, NMEM nmem,
- data1_node *res, const char **attr);
-
-YAZ_EXPORT data1_node *data1_mk_text_n (data1_handle dh, NMEM mem,
- const char *buf, size_t len,
- data1_node *parent);
-YAZ_EXPORT data1_node *data1_mk_text_nf (data1_handle dh, NMEM mem,
- const char *buf, size_t len,
- data1_node *parent);
-YAZ_EXPORT data1_node *data1_mk_text (data1_handle dh, NMEM mem,
- const char *buf, data1_node *parent);
-
-YAZ_EXPORT data1_node *data1_mk_comment_n (data1_handle dh, NMEM mem,
- const char *buf, size_t len,
- data1_node *parent);
-
-YAZ_EXPORT data1_node *data1_mk_comment (data1_handle dh, NMEM mem,
- const char *buf, data1_node *parent);
-
-YAZ_EXPORT data1_node *data1_mk_preprocess_n (data1_handle dh, NMEM nmem,
- const char *target, size_t len,
- const char **attr,
- data1_node *at);
-
-YAZ_EXPORT data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
- const char *target,
- const char **attr,
- data1_node *at);
-
-YAZ_EXPORT data1_node *data1_insert_preprocess_n (data1_handle dh, NMEM nmem,
- const char *target,
- size_t len,
- const char **attr,
- data1_node *at);
-
-YAZ_EXPORT data1_node *data1_insert_preprocess (data1_handle dh, NMEM nmem,
- const char *target,
- const char **attr,
- data1_node *at);
-
-YAZ_EXPORT data1_node *data1_mk_root (data1_handle dh, NMEM nmem,
- const char *name);
-YAZ_EXPORT void data1_set_root(data1_handle dh, data1_node *res,
- NMEM nmem, const char *name);
-
-YAZ_EXPORT data1_node *data1_mk_tag_data_zint (data1_handle dh, data1_node *at,
- const char *tag, zint num,
- NMEM nmem);
-YAZ_EXPORT data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
- const char *tag, int num,
- NMEM nmem);
-YAZ_EXPORT data1_node *data1_mk_tag_data_oid (data1_handle dh, data1_node *at,
- const char *tag, Odr_oid *oid,
- NMEM nmem);
-YAZ_EXPORT data1_node *data1_mk_tag_data_text (data1_handle dh, data1_node *at,
- const char *tag,
- const char *str,
- NMEM nmem);
-YAZ_EXPORT data1_node *data1_mk_tag_data_text_uni (data1_handle dh,
- data1_node *at,
- const char *tag,
- const char *str,
- NMEM nmem);
-
-YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name);
-
-YAZ_EXPORT data1_node *data1_search_tag (data1_handle dh, data1_node *n,
- const char *tag);
-YAZ_EXPORT data1_node *data1_mk_tag_uni (data1_handle dh, NMEM nmem,
- const char *tag, data1_node *at);
-YAZ_EXPORT data1_attset *data1_get_attset (data1_handle dh, const char *name);
-YAZ_EXPORT data1_maptab *data1_read_maptab(data1_handle dh, const char *file);
-YAZ_EXPORT data1_node *data1_map_record(data1_handle dh, data1_node *n,
- data1_maptab *map, NMEM m);
-YAZ_EXPORT data1_marctab *data1_read_marctab (data1_handle dh,
- const char *file);
-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,
- int select, int *len);
-YAZ_EXPORT Z_ExplainRecord *data1_nodetoexplain(data1_handle dh,
- data1_node *n, int select,
- ODR o);
-YAZ_EXPORT Z_BriefBib *data1_nodetosummary(data1_handle dh,
- data1_node *n, int select,
- ODR o);
-YAZ_EXPORT char *data1_nodetosoif(data1_handle dh, data1_node *n, int select,
- int *len);
-YAZ_EXPORT void data1_set_tabpath(data1_handle dh, const char *path);
-YAZ_EXPORT void data1_set_tabroot (data1_handle dp, const char *p);
-YAZ_EXPORT const char *data1_get_tabpath(data1_handle dh);
-YAZ_EXPORT const char *data1_get_tabroot(data1_handle dh);
-
-YAZ_EXPORT WRBUF data1_get_wrbuf (data1_handle dp);
-YAZ_EXPORT char **data1_get_read_buf (data1_handle dp, int **lenp);
-YAZ_EXPORT char **data1_get_map_buf (data1_handle dp, int **lenp);
-YAZ_EXPORT data1_absyn_cache *data1_absyn_cache_get (data1_handle dh);
-YAZ_EXPORT data1_attset_cache *data1_attset_cache_get (data1_handle dh);
-YAZ_EXPORT NMEM data1_nmem_get (data1_handle dh);
-YAZ_EXPORT void data1_pr_tree (data1_handle dh, data1_node *n, FILE *out);
-YAZ_EXPORT char *data1_insert_string (data1_handle dh, data1_node *res,
- NMEM m, const char *str);
-YAZ_EXPORT char *data1_insert_string_n (data1_handle dh, data1_node *res,
- NMEM m, const char *str, size_t len);
-YAZ_EXPORT data1_node *data1_read_sgml (data1_handle dh, NMEM m,
- const char *buf);
-YAZ_EXPORT data1_node *data1_read_xml (data1_handle dh,
- int (*rf)(void *, char *, size_t),
- void *fh, NMEM m);
-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 char *data1_getNodeValue(data1_node* node, char* pTagPath);
-YAZ_EXPORT data1_node *data1_LookupNode(data1_node* node, char* pTagPath);
-YAZ_EXPORT int data1_CountOccurences(data1_node* node, char* pTagPath);
-
-YAZ_EXPORT FILE *data1_path_fopen (data1_handle dh, const char *file,
- const char *mode);
-
-/* obsolete functions ... */
-
-YAZ_EXPORT data1_node *data1_mk_node (data1_handle dh, NMEM m);
-YAZ_EXPORT data1_node *data1_insert_taggeddata (data1_handle dh,
- data1_node *root,
- data1_node *at,
- const char *tagname, NMEM m);
-YAZ_EXPORT data1_node *data1_mk_node_type (data1_handle dh, NMEM m, int type);
-YAZ_EXPORT data1_node *data1_add_taggeddata (data1_handle dh, data1_node *root,
- data1_node *at,
- const char *tagname,
- NMEM m);
-
-YAZ_EXPORT data1_node *data1_get_root_tag (data1_handle dh, data1_node *n);
-
-YAZ_EXPORT int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
- const char *tocode,
- const char *fromcode);
-
-YAZ_EXPORT const char *data1_get_encoding (data1_handle dh, data1_node *n);
-
-YAZ_EXPORT int data1_is_xmlmode(data1_handle dh);
-
-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_absyn_destroy(data1_handle dh);
-
-YAZ_END_CDECL
-
-#endif
-# $Id: Makefile.am,v 1.1 2004-08-25 09:23:36 adam Exp $
+# $Id: Makefile.am,v 1.2 2004-09-28 10:15:03 adam Exp $
-pkginclude_HEADERS=api.h version.h res.h
+pkginclude_HEADERS=api.h version.h res.h recctrl.h data1.h recgrs.h
--- /dev/null
+/* $Id: data1.h,v 1.1 2004-09-28 10:15:03 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+#ifndef DATA1_H
+#define DATA1_H
+
+#include <stdio.h>
+
+#include <yaz/nmem.h>
+#include <yaz/oid.h>
+#include <yaz/proto.h>
+
+#include <idzebra/version.h>
+#include <d1_attset.h>
+#include <d1_map.h>
+#include <yaz/yaz-util.h>
+#include <yaz/wrbuf.h>
+
+#define d1_isspace(c) strchr(" \r\n\t\f", c)
+#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
+
+YAZ_BEGIN_CDECL
+
+#define data1_matchstr(s1, s2) yaz_matchstr(s1, s2)
+
+#define DATA1_MAX_SYMBOL 31
+
+typedef struct data1_name
+{
+ char *name;
+ struct data1_name *next;
+} data1_name;
+
+typedef struct data1_absyn_cache_info *data1_absyn_cache;
+typedef struct data1_attset_cache_info *data1_attset_cache;
+typedef struct data1_absyn data1_absyn;
+
+typedef enum data1_datatype
+{
+ DATA1K_unknown,
+ DATA1K_structured,
+ DATA1K_string,
+ DATA1K_numeric,
+ DATA1K_bool,
+ DATA1K_oid,
+ DATA1K_generalizedtime,
+ DATA1K_intunit,
+ DATA1K_int,
+ DATA1K_octetstring,
+ DATA1K_null
+} data1_datatype;
+
+typedef struct data1_marctab
+{
+ char *name;
+ oid_value reference;
+
+ char record_status[2];
+ char implementation_codes[5];
+ int indicator_length;
+ int identifier_length;
+ char user_systems[4];
+
+ int length_data_entry;
+ int length_starting;
+ int length_implementation;
+ char future_use[2];
+
+ int force_indicator_length;
+ int force_identifier_length;
+ char leader[24]; /* Fixme! Need linear access to LEADER of MARC record */
+ struct data1_marctab *next;
+} data1_marctab;
+
+typedef struct data1_esetname
+{
+ char *name;
+ Z_Espec1 *spec;
+ struct data1_esetname *next;
+} data1_esetname;
+
+/*
+ * Variant set definitions.
+ */
+
+typedef struct data1_vartype
+{
+ char *name;
+ struct data1_varclass *zclass;
+ int type;
+ data1_datatype datatype;
+ struct data1_vartype *next;
+} data1_vartype;
+
+typedef struct data1_varclass
+{
+ char *name;
+ struct data1_varset *set;
+ int zclass;
+ data1_vartype *types;
+ struct data1_varclass *next;
+} data1_varclass;
+
+typedef struct data1_varset
+{
+ char *name;
+ oid_value reference;
+ data1_varclass *classes;
+} data1_varset;
+
+/*
+ * Tagset definitions
+ */
+
+struct data1_tagset;
+
+typedef struct data1_tag
+{
+ data1_name *names;
+#define DATA1T_numeric 1
+#define DATA1T_string 2
+ int which;
+ union
+ {
+ int numeric;
+ char *string;
+ } value;
+ data1_datatype kind;
+
+ struct data1_tagset *tagset;
+ struct data1_tag *next;
+} data1_tag;
+
+typedef struct data1_tagset data1_tagset;
+
+struct data1_tagset
+{
+ int type; /* type of tagset in current context */
+ char *name; /* symbolic name */
+ oid_value reference;
+ data1_tag *tags; /* tags defined by this set */
+ data1_tagset *children; /* children */
+ data1_tagset *next; /* sibling */
+};
+
+typedef struct data1_termlist
+{
+ data1_att *att;
+ char *structure;
+ char *source;
+ struct data1_termlist *next;
+} data1_termlist;
+
+/*
+ * abstract syntax specification
+ */
+
+typedef struct data1_element
+{
+ char *name;
+ data1_tag *tag;
+ data1_termlist *termlists;
+ char *sub_name;
+ struct data1_element *children;
+ struct data1_element *next;
+} data1_element;
+
+typedef struct data1_sub_elements {
+ char *name;
+ struct data1_sub_elements *next;
+ data1_element *elements;
+} data1_sub_elements;
+
+typedef struct data1_xattr {
+ char *name;
+ char *value;
+ struct data1_xattr *next;
+ unsigned short what; /* DATA1I_text, .. see data1_node.u.data */
+} data1_xattr;
+
+
+/*
+ * record data node (tag/data/variant)
+ */
+
+typedef struct data1_node
+{
+ /* the root of a record (containing global data) */
+#define DATA1N_root 1
+ /* a tag */
+#define DATA1N_tag 2
+ /* some data under a leaf tag or variant */
+#define DATA1N_data 3
+ /* variant specification (a triple, actually) */
+#define DATA1N_variant 4
+ /* comment (same as data) */
+#define DATA1N_comment 5
+ /* preprocessing instruction */
+#define DATA1N_preprocess 6
+ int which;
+ union
+ {
+ struct
+ {
+ char *type;
+ struct data1_absyn *absyn; /* abstract syntax for this type */
+ } root;
+
+ struct
+ {
+ char *tag;
+ data1_element *element;
+ int no_data_requested;
+ int get_bytes;
+ unsigned node_selected : 1;
+ unsigned make_variantlist : 1;
+ data1_xattr *attributes;
+ } tag;
+
+ struct
+ {
+ char *data; /* filename or data */
+ int len;
+ /* text inclusion */
+#define DATA1I_inctxt 1
+ /* binary data inclusion */
+#define DATA1I_incbin 2
+ /* text data */
+#define DATA1I_text 3
+ /* numerical data */
+#define DATA1I_num 4
+ /* object identifier */
+#define DATA1I_oid 5
+ /* XML text */
+#define DATA1I_xmltext 6
+ unsigned what:7;
+ unsigned formatted_text : 1; /* newlines are significant */
+ } data;
+
+ struct
+ {
+ data1_vartype *type;
+ char *value;
+ } variant;
+
+ struct
+ {
+ char *target;
+ data1_xattr *attributes;
+ } 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;
+ struct data1_node *child;
+ struct data1_node *last_child;
+ struct data1_node *parent;
+ struct data1_node *root;
+} data1_node;
+
+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);
+YAZ_EXPORT data1_node *data1_read_node(data1_handle dh, const char **buf,
+ NMEM m);
+YAZ_EXPORT data1_node *data1_read_nodex (data1_handle dh, NMEM m,
+ int (*get_byte)(void *fh), void *fh,
+ WRBUF wrbuf);
+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 data1_tag *data1_gettagbynum(data1_handle dh,
+ data1_tagset *s,
+ int type, int value);
+YAZ_EXPORT data1_tagset *data1_empty_tagset (data1_handle dh);
+YAZ_EXPORT data1_tagset *data1_read_tagset(data1_handle dh,
+ const char *file,
+ int type);
+YAZ_EXPORT data1_element *data1_getelementbytagname(data1_handle dh,
+ data1_absyn *abs,
+ data1_element *parent,
+ const char *tagname);
+YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
+ int select, ODR o,
+ 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,
+ data1_node *at,
+ const char *tagname, NMEM m);
+YAZ_EXPORT data1_node *data1_mk_tag_data(data1_handle dh, data1_node *at,
+ const char *tagname, NMEM m);
+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);
+YAZ_EXPORT data1_vartype *data1_getvartypeby_absyn(data1_handle dh,
+ data1_absyn *absyn,
+ char *zclass, char *type);
+YAZ_EXPORT Z_Espec1 *data1_read_espec1(data1_handle dh, const char *file);
+YAZ_EXPORT int data1_doespec1(data1_handle dh, data1_node *n, Z_Espec1 *e);
+YAZ_EXPORT data1_esetname *data1_getesetbyname(data1_handle dh,
+ data1_absyn *a,
+ const char *name);
+YAZ_EXPORT data1_element *data1_getelementbyname(data1_handle dh,
+ data1_absyn *absyn,
+ const char *name);
+YAZ_EXPORT data1_node *data1_mk_node2(data1_handle dh, NMEM m,
+ int type, data1_node *parent);
+
+YAZ_EXPORT data1_node *data1_mk_tag (data1_handle dh, NMEM nmem,
+ const char *tag, const char **attr,
+ data1_node *at);
+YAZ_EXPORT data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
+ const char *tag, size_t len,
+ const char **attr,
+ data1_node *at);
+YAZ_EXPORT void data1_tag_add_attr (data1_handle dh, NMEM nmem,
+ data1_node *res, const char **attr);
+
+YAZ_EXPORT data1_node *data1_mk_text_n (data1_handle dh, NMEM mem,
+ const char *buf, size_t len,
+ data1_node *parent);
+YAZ_EXPORT data1_node *data1_mk_text_nf (data1_handle dh, NMEM mem,
+ const char *buf, size_t len,
+ data1_node *parent);
+YAZ_EXPORT data1_node *data1_mk_text (data1_handle dh, NMEM mem,
+ const char *buf, data1_node *parent);
+
+YAZ_EXPORT data1_node *data1_mk_comment_n (data1_handle dh, NMEM mem,
+ const char *buf, size_t len,
+ data1_node *parent);
+
+YAZ_EXPORT data1_node *data1_mk_comment (data1_handle dh, NMEM mem,
+ const char *buf, data1_node *parent);
+
+YAZ_EXPORT data1_node *data1_mk_preprocess_n (data1_handle dh, NMEM nmem,
+ const char *target, size_t len,
+ const char **attr,
+ data1_node *at);
+
+YAZ_EXPORT data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
+ const char *target,
+ const char **attr,
+ data1_node *at);
+
+YAZ_EXPORT data1_node *data1_insert_preprocess_n (data1_handle dh, NMEM nmem,
+ const char *target,
+ size_t len,
+ const char **attr,
+ data1_node *at);
+
+YAZ_EXPORT data1_node *data1_insert_preprocess (data1_handle dh, NMEM nmem,
+ const char *target,
+ const char **attr,
+ data1_node *at);
+
+YAZ_EXPORT data1_node *data1_mk_root (data1_handle dh, NMEM nmem,
+ const char *name);
+YAZ_EXPORT void data1_set_root(data1_handle dh, data1_node *res,
+ NMEM nmem, const char *name);
+
+YAZ_EXPORT data1_node *data1_mk_tag_data_zint (data1_handle dh, data1_node *at,
+ const char *tag, zint num,
+ NMEM nmem);
+YAZ_EXPORT data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
+ const char *tag, int num,
+ NMEM nmem);
+YAZ_EXPORT data1_node *data1_mk_tag_data_oid (data1_handle dh, data1_node *at,
+ const char *tag, Odr_oid *oid,
+ NMEM nmem);
+YAZ_EXPORT data1_node *data1_mk_tag_data_text (data1_handle dh, data1_node *at,
+ const char *tag,
+ const char *str,
+ NMEM nmem);
+YAZ_EXPORT data1_node *data1_mk_tag_data_text_uni (data1_handle dh,
+ data1_node *at,
+ const char *tag,
+ const char *str,
+ NMEM nmem);
+
+YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name);
+
+YAZ_EXPORT data1_node *data1_search_tag (data1_handle dh, data1_node *n,
+ const char *tag);
+YAZ_EXPORT data1_node *data1_mk_tag_uni (data1_handle dh, NMEM nmem,
+ const char *tag, data1_node *at);
+YAZ_EXPORT data1_attset *data1_get_attset (data1_handle dh, const char *name);
+YAZ_EXPORT data1_maptab *data1_read_maptab(data1_handle dh, const char *file);
+YAZ_EXPORT data1_node *data1_map_record(data1_handle dh, data1_node *n,
+ data1_maptab *map, NMEM m);
+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);
+YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh,
+ data1_absyn *absyn);
+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,
+ int select, int *len);
+YAZ_EXPORT Z_ExplainRecord *data1_nodetoexplain(data1_handle dh,
+ data1_node *n, int select,
+ ODR o);
+YAZ_EXPORT Z_BriefBib *data1_nodetosummary(data1_handle dh,
+ data1_node *n, int select,
+ ODR o);
+YAZ_EXPORT char *data1_nodetosoif(data1_handle dh, data1_node *n, int select,
+ int *len);
+YAZ_EXPORT void data1_set_tabpath(data1_handle dh, const char *path);
+YAZ_EXPORT void data1_set_tabroot (data1_handle dp, const char *p);
+YAZ_EXPORT const char *data1_get_tabpath(data1_handle dh);
+YAZ_EXPORT const char *data1_get_tabroot(data1_handle dh);
+
+YAZ_EXPORT WRBUF data1_get_wrbuf (data1_handle dp);
+YAZ_EXPORT char **data1_get_read_buf (data1_handle dp, int **lenp);
+YAZ_EXPORT char **data1_get_map_buf (data1_handle dp, int **lenp);
+YAZ_EXPORT data1_absyn_cache *data1_absyn_cache_get (data1_handle dh);
+YAZ_EXPORT data1_attset_cache *data1_attset_cache_get (data1_handle dh);
+YAZ_EXPORT NMEM data1_nmem_get (data1_handle dh);
+YAZ_EXPORT void data1_pr_tree (data1_handle dh, data1_node *n, FILE *out);
+YAZ_EXPORT char *data1_insert_string (data1_handle dh, data1_node *res,
+ NMEM m, const char *str);
+YAZ_EXPORT char *data1_insert_string_n (data1_handle dh, data1_node *res,
+ NMEM m, const char *str, size_t len);
+YAZ_EXPORT data1_node *data1_read_sgml (data1_handle dh, NMEM m,
+ const char *buf);
+YAZ_EXPORT data1_node *data1_read_xml (data1_handle dh,
+ int (*rf)(void *, char *, size_t),
+ void *fh, NMEM m);
+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 char *data1_getNodeValue(data1_node* node, char* pTagPath);
+YAZ_EXPORT data1_node *data1_LookupNode(data1_node* node, char* pTagPath);
+YAZ_EXPORT int data1_CountOccurences(data1_node* node, char* pTagPath);
+
+YAZ_EXPORT FILE *data1_path_fopen (data1_handle dh, const char *file,
+ const char *mode);
+
+/* obsolete functions ... */
+
+YAZ_EXPORT data1_node *data1_mk_node (data1_handle dh, NMEM m);
+YAZ_EXPORT data1_node *data1_insert_taggeddata (data1_handle dh,
+ data1_node *root,
+ data1_node *at,
+ const char *tagname, NMEM m);
+YAZ_EXPORT data1_node *data1_mk_node_type (data1_handle dh, NMEM m, int type);
+YAZ_EXPORT data1_node *data1_add_taggeddata (data1_handle dh, data1_node *root,
+ data1_node *at,
+ const char *tagname,
+ NMEM m);
+
+YAZ_EXPORT data1_node *data1_get_root_tag (data1_handle dh, data1_node *n);
+
+YAZ_EXPORT int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
+ const char *tocode,
+ const char *fromcode);
+
+YAZ_EXPORT const char *data1_get_encoding (data1_handle dh, data1_node *n);
+
+YAZ_EXPORT int data1_is_xmlmode(data1_handle dh);
+
+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_absyn_destroy(data1_handle dh);
+
+YAZ_END_CDECL
+
+#endif
--- /dev/null
+/* $Id: recctrl.h,v 1.1 2004-09-28 10:15:03 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
+
+#ifndef RECCTRL_H
+#define RECCTRL_H
+
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/odr.h>
+#include <idzebra/res.h>
+#include <idzebra/data1.h>
+#include <zebramap.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* single word entity */
+typedef struct {
+ int attrSet;
+ int attrUse;
+ unsigned reg_type;
+ char *string;
+ int length;
+ int seqno;
+ ZebraMaps zebra_maps;
+ struct recExtractCtrl *extractCtrl;
+} RecWord;
+
+/* Extract record control */
+struct recExtractCtrl {
+ void *fh; /* File handle and read function */
+ int (*readf)(void *fh, char *buf, size_t count);
+ off_t (*seekf)(void *fh, off_t offset); /* seek function */
+ off_t (*tellf)(void *fh); /* tell function */
+ void (*endf)(void *fh, off_t offset); /* end of record position */
+ off_t offset; /* start offset */
+ void (*init)(struct recExtractCtrl *p, RecWord *w);
+ void *clientData;
+ void (*tokenAdd)(RecWord *w);
+ ZebraMaps zebra_maps;
+ int flagShowRecords;
+ int seqno[256];
+ void (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
+ data1_handle dh;
+ void *handle;
+};
+
+/* Retrieve record control */
+struct recRetrieveCtrl {
+ /* Input parameters ... */
+ Res res; /* Resource pool */
+ ODR odr; /* ODR used to create response */
+ void *fh; /* File descriptor and read function */
+ int (*readf)(void *fh, char *buf, size_t count);
+ off_t (*seekf)(void *fh, off_t offset);
+ off_t (*tellf)(void *fh);
+ oid_value input_format; /* Preferred record syntax */
+ Z_RecordComposition *comp; /* formatting instructions */
+ char *encoding; /* preferred character encoding */
+ zint localno; /* local id of record */
+ int score; /* score 0-1000 or -1 if none */
+ int recordSize; /* size of record in bytes */
+ char *fname; /* name of file (or NULL if internal) */
+ data1_handle dh;
+
+ /* response */
+ oid_value output_format;
+ void *rec_buf;
+ int rec_len;
+ int diagnostic;
+ char *message;
+};
+
+typedef struct recType *RecType;
+
+struct recType
+{
+ char *name; /* Name of record type */
+ void *(*init)(Res res, RecType recType); /* Init function - called once */
+ void (*config)(void *clientData, Res res, const char *args); /* Config */
+ void (*destroy)(void *clientData); /* Destroy function */
+ int (*extract)(void *clientData,
+ struct recExtractCtrl *ctrl); /* Extract proc */
+ int (*retrieve)(void *clientData,
+ struct recRetrieveCtrl *ctrl); /* Retrieve proc */
+};
+
+#define RECCTRL_EXTRACT_OK 0
+#define RECCTRL_EXTRACT_EOF 1
+#define RECCTRL_EXTRACT_ERROR_GENERIC 2
+#define RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER 3
+
+typedef struct recTypeClass *RecTypeClass;
+typedef struct recTypes *RecTypes;
+
+RecTypeClass recTypeClass_create (Res res, NMEM nmem);
+void recTypeClass_destroy(RecTypeClass rtc);
+void recTypeClass_info(RecTypeClass rtc, void *cd,
+ void (*cb)(void *cd, const char *s));
+
+RecTypes recTypes_init(RecTypeClass rtc, data1_handle dh);
+void recTypes_destroy(RecTypes recTypes);
+void recTypes_default_handlers(RecTypes recTypes, Res res);
+
+RecType recType_byName(RecTypes rts, Res res, const char *name,
+ void **clientDataP);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- /dev/null
+/* $Id: recgrs.h,v 1.1 2004-09-28 10:15:03 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+#ifndef GRSREAD_H
+#define GRSREAD_H
+
+#include <idzebra/recctrl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct grs_read_info {
+ void *clientData;
+ int (*readf)(void *, char *, size_t);
+ off_t (*seekf)(void *, off_t);
+ off_t (*tellf)(void *);
+ void (*endf)(void *, off_t);
+ void *fh;
+ off_t offset;
+ NMEM mem;
+ data1_handle dh;
+};
+
+int zebra_grs_extract(void *clientData, struct recExtractCtrl *p,
+ data1_node *(*grs_read)(struct grs_read_info *));
+
+int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
+ data1_node *(*grs_read)(struct grs_read_info *));
+
+
+int grs_extract_tree(struct recExtractCtrl *p, data1_node *n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+++ /dev/null
-/* $Id: recctrl.h,v 1.42 2004-09-27 10:44:48 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
-
-This file is part of the Zebra server.
-
-Zebra is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-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.
-*/
-
-
-
-#ifndef RECCTRL_H
-#define RECCTRL_H
-
-#include <yaz/proto.h>
-#include <yaz/oid.h>
-#include <yaz/odr.h>
-#include <idzebra/res.h>
-#include <data1.h>
-#include <zebramap.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* single word entity */
-typedef struct {
- int attrSet;
- int attrUse;
- unsigned reg_type;
- char *string;
- int length;
- int seqno;
- ZebraMaps zebra_maps;
- struct recExtractCtrl *extractCtrl;
-} RecWord;
-
-/* Extract record control */
-struct recExtractCtrl {
- void *fh; /* File handle and read function */
- int (*readf)(void *fh, char *buf, size_t count);
- off_t (*seekf)(void *fh, off_t offset); /* seek function */
- off_t (*tellf)(void *fh); /* tell function */
- void (*endf)(void *fh, off_t offset); /* end of record position */
- off_t offset; /* start offset */
- void (*init)(struct recExtractCtrl *p, RecWord *w);
- void *clientData;
- void (*tokenAdd)(RecWord *w);
- ZebraMaps zebra_maps;
- int flagShowRecords;
- int seqno[256];
- void (*schemaAdd)(struct recExtractCtrl *p, Odr_oid *oid);
- data1_handle dh;
- void *handle;
-};
-
-/* Retrieve record control */
-struct recRetrieveCtrl {
- /* Input parameters ... */
- Res res; /* Resource pool */
- ODR odr; /* ODR used to create response */
- void *fh; /* File descriptor and read function */
- int (*readf)(void *fh, char *buf, size_t count);
- off_t (*seekf)(void *fh, off_t offset);
- off_t (*tellf)(void *fh);
- oid_value input_format; /* Preferred record syntax */
- Z_RecordComposition *comp; /* formatting instructions */
- char *encoding; /* preferred character encoding */
- zint localno; /* local id of record */
- int score; /* score 0-1000 or -1 if none */
- int recordSize; /* size of record in bytes */
- char *fname; /* name of file (or NULL if internal) */
- data1_handle dh;
-
- /* response */
- oid_value output_format;
- void *rec_buf;
- int rec_len;
- int diagnostic;
- char *message;
-};
-
-typedef struct recType *RecType;
-
-struct recType
-{
- char *name; /* Name of record type */
- void *(*init)(Res res, RecType recType); /* Init function - called once */
- void (*config)(void *clientData, Res res, const char *args); /* Config */
- void (*destroy)(void *clientData); /* Destroy function */
- int (*extract)(void *clientData,
- struct recExtractCtrl *ctrl); /* Extract proc */
- int (*retrieve)(void *clientData,
- struct recRetrieveCtrl *ctrl); /* Retrieve proc */
-};
-
-#define RECCTRL_EXTRACT_OK 0
-#define RECCTRL_EXTRACT_EOF 1
-#define RECCTRL_EXTRACT_ERROR_GENERIC 2
-#define RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER 3
-
-typedef struct recTypeClass *RecTypeClass;
-typedef struct recTypes *RecTypes;
-
-RecTypeClass recTypeClass_create (Res res, NMEM nmem);
-void recTypeClass_destroy(RecTypeClass rtc);
-void recTypeClass_info(RecTypeClass rtc, void *cd,
- void (*cb)(void *cd, const char *s));
-
-RecTypes recTypes_init(RecTypeClass rtc, data1_handle dh);
-void recTypes_destroy(RecTypes recTypes);
-void recTypes_default_handlers(RecTypes recTypes, Res res);
-
-RecType recType_byName(RecTypes rts, Res res, const char *name,
- void **clientDataP);
-
-
-int grs_extract_tree(struct recExtractCtrl *p, data1_node *n);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
#ifndef ZEBRA_XPATH_H
#define ZEBRA_XPATH_H
+#include <yaz/nmem.h>
+
#define XPATH_STEP_COUNT 10
struct xpath_predicate {
int which;
void dump_xp_steps (struct xpath_location_step *xpath, int no);
+
#endif
-/* $Id: index.h,v 1.121 2004-09-27 10:44:49 adam Exp $
+/* $Id: index.h,v 1.122 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <isams.h>
#include <isamc.h>
#include <isamb.h>
-#include <data1.h>
-#include <recctrl.h>
+#include <d1_absyn.h>
+#include <idzebra/recgrs.h>
#include "recindex.h"
#include <idzebra/api.h>
#include "zinfo.h"
-/* $Id: main.c,v 1.115 2004-09-27 10:44:49 adam Exp $
+/* $Id: main.c,v 1.116 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <sys/times.h>
#endif
-#include <data1.h>
+#include <yaz/log.h>
#include <idzebra/api.h>
char *prog;
-/* $Id: zinfo.h,v 1.18 2004-08-25 09:23:38 adam Exp $
+/* $Id: zinfo.h,v 1.19 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#ifndef ZINFO_H
#define ZINFO_H
-#include <data1.h>
+#include <d1_absyn.h>
#include <idzebra/api.h>
#include "recindex.h"
%{
#include <idzebra/api.h>
#include "zebra_perl.h"
-#include "data1.h"
+#include <idzebra/data1.h>
#include "yaz/odr.h"
#include "yaz/cql.h"
%}
-#if 0
-#include "zebraapi.h"
-#endif
-
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
#include "zebra_perl.h"
#include "../recctrl/perlread.h"
-#include <data1.h>
+#include <idzebra/data1.h>
NMEM handles;
-## $Id: Makefile.am,v 1.12 2004-09-27 10:44:50 adam Exp $
+## $Id: Makefile.am,v 1.13 2004-09-28 10:15:03 adam Exp $
common_libs = libidzebra-recctrl.la \
../data1/libidzebra-data1.la \
# The common library
lib_LTLIBRARIES = libidzebra-recctrl.la
-libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c grsread.h
+libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c
libidzebra_recctrl_la_LDFLAGS = -export-dynamic
libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \
../data1/libidzebra-data1.la \
-/* $Id: danbibr.c,v 1.5 2004-09-27 10:44:50 adam Exp $
+/* $Id: danbibr.c,v 1.6 2004-09-28 10:15:03 adam Exp $
Copyright (C) 2004
Index Data Aps
#include <yaz/log.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
#include <yaz/xmalloc.h>
-#include <yaz/log.h>
-#include <data1.h>
#define READ_CHUNK 200
+++ /dev/null
-/* $Id: grsread.h,v 1.15 2004-09-27 10:44:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
-
-This file is part of the Zebra server.
-
-Zebra is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-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.
-*/
-
-#ifndef GRSREAD_H
-#define GRSREAD_H
-
-#include <data1.h>
-#include <recctrl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct grs_read_info {
- void *clientData;
- int (*readf)(void *, char *, size_t);
- off_t (*seekf)(void *, off_t);
- off_t (*tellf)(void *);
- void (*endf)(void *, off_t);
- void *fh;
- off_t offset;
- NMEM mem;
- data1_handle dh;
-};
-
-int zebra_grs_extract(void *clientData, struct recExtractCtrl *p,
- data1_node *(*grs_read)(struct grs_read_info *));
-
-int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
- data1_node *(*grs_read)(struct grs_read_info *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* $Id: marcread.c,v 1.25 2004-09-27 10:44:50 adam Exp $
+/* $Id: marcread.c,v 1.26 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/log.h>
#include <yaz/yaz-util.h>
#include <yaz/marcdisp.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
#include "marcomp.h"
#include "inline.h"
else
res_top = data1_mk_tag (p->dh, p->mem, absynName, 0, res_root);
- if ((marctab = res_root->u.root.absyn->marc))
+ if ((marctab = data1_absyn_getmarctab(p->dh, res_root->u.root.absyn)))
{
memcpy(marctab->leader, buf, 24);
memcpy(marctab->implementation_codes, buf+6, 4);
static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt,
data1_node *root)
{
- data1_marctab *marctab = root->u.root.absyn->marc;
+ data1_marctab *marctab = data1_absyn_getmarctab(p->dh, root->u.root.absyn);
data1_node *top = root->child;
data1_node *field;
mc_context *c;
if (!root)
return 0;
- for (e=root->u.root.absyn->main_elements; e; e=e->next)
+ for (e = data1_absyn_getelements(p->dh, root->u.root.absyn); e; e=e->next)
{
data1_tag *tag = e->tag;
if (!root)
return 0;
- for (e=root->u.root.absyn->main_elements; e; e=e->next)
+ for (e = data1_absyn_getelements(p->dh, root->u.root.absyn); e; e=e->next)
{
data1_tag *tag = e->tag;
-/* $Id: perlread.c,v 1.10 2004-09-27 10:44:50 adam Exp $
+/* $Id: perlread.c,v 1.11 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <ctype.h>
#include <yaz/tpath.h>
-#include <zebrautl.h>
-#include <dfa.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
/* Constructor call for the filter object */
void Filter_create (struct perl_context *context)
#define GRS_PERL_MODULE_NAME_MAXLEN 255
-#include <data1.h>
+#include <idzebra/data1.h>
/* Context information for the filter */
struct perl_context {
-/* $Id: recctrl.c,v 1.8 2004-09-28 08:44:48 adam Exp $
+/* $Id: recctrl.c,v 1.9 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <direntz.h>
#include <zebrautl.h>
-#include <recctrl.h>
+#include <idzebra/recctrl.h>
struct recTypeClass {
RecType recType;
-/* $Id: recgrs.c,v 1.90 2004-09-27 10:44:50 adam Exp $
+/* $Id: recgrs.c,v 1.91 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/log.h>
#include <yaz/oid.h>
-#include <recctrl.h>
-#include "grsread.h"
+#include <d1_absyn.h>
+#include <idzebra/recgrs.h>
#define GRS_MAX_WORD 512
-/* $Id: rectext.c,v 1.20 2004-09-27 10:44:50 adam Exp $
+/* $Id: rectext.c,v 1.21 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <ctype.h>
#include <zebrautl.h>
-#include <recctrl.h>
+#include <idzebra/recctrl.h>
struct text_info {
char *sep;
-/* $Id: regxread.c,v 1.53 2004-09-27 10:44:50 adam Exp $
+/* $Id: regxread.c,v 1.54 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/tpath.h>
#include <zebrautl.h>
#include <dfa.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
#if HAVE_TCL_H
#include <tcl.h>
#endif
if (!(tp =
- data1_getvartypebyct(spec->dh, parent->root->u.root.absyn->varset,
- tclass, ttype)))
+ data1_getvartypeby_absyn(spec->dh, parent->root->u.root.absyn,
+ tclass, ttype)))
return;
if (parent->which != DATA1N_variant)
-/* $Id: sgmlread.c,v 1.12 2004-09-27 10:44:50 adam Exp $
+/* $Id: sgmlread.c,v 1.13 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <assert.h>
#include <yaz/log.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
struct sgml_getc_info {
char *buf;
-/* $Id: xmlread.c,v 1.14 2004-09-27 10:44:50 adam Exp $
+/* $Id: xmlread.c,v 1.15 2004-09-28 10:15:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <yaz/log.h>
-#include "grsread.h"
+#include <idzebra/recgrs.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
-#include <data1.h>
#include <expat.h>
-/* $Id: xpath.c,v 1.3 2003-03-01 22:45:38 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: xpath.c,v 1.4 2004-09-28 10:15:03 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
projects / idzebra-moved-to-github.git / commitdiff