projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify XML attribute node creation (xattr). Add data1 utilities
[idzebra-moved-to-github.git]
/
include
/
data1.h
diff --git
a/include/data1.h
b/include/data1.h
index
33958f9
..
276bdd5
100644
(file)
--- a/
include/data1.h
+++ b/
include/data1.h
@@
-1,5
+1,5
@@
-/* $Id: data1.h,v 1.3 2002-12-02 16:55:14 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: data1.h,v 1.9 2004-07-26 12:20:06 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.
Index Data Aps
This file is part of the Zebra server.
@@
-23,6
+23,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef DATA1_H
#define DATA1_H
#ifndef DATA1_H
#define DATA1_H
+#define ENHANCED_XELM 1
+
#include <stdio.h>
#include <yaz/nmem.h>
#include <stdio.h>
#include <yaz/nmem.h>
@@
-33,6
+35,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <d1_map.h>
#include <yaz/yaz-util.h>
#include <yaz/wrbuf.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')
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
@@
-85,6
+89,7
@@
typedef struct data1_marctab
int force_indicator_length;
int force_identifier_length;
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;
struct data1_marctab *next;
} data1_marctab;
@@
-187,6
+192,19
@@
typedef struct data1_sub_elements {
data1_element *elements;
} data1_sub_elements;
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;
typedef struct data1_xattr {
char *name;
char *value;
@@
-209,6
+227,7
@@
typedef struct data1_absyn
data1_marctab *marc;
data1_sub_elements *sub_elements;
data1_element *main_elements;
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;
struct data1_systag *systags;
char *encoding;
int enable_xpath_indexing;
@@
-388,6
+407,17
@@
YAZ_EXPORT data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
const char **attr,
data1_node *at);
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,
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,
@@
-493,6
+523,10
@@
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 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
YAZ_END_CDECL
#endif