X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fidzebra%2Fdata1.h;h=31198abb2d14a6f0d23578b57a678e07cdcfe2de;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hp=b12d7950894b5d26af96383be48c80c01a30b791;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index b12d795..31198ab 100644
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,8 +1,5 @@
-/* $Id: data1.h,v 1.22 2007-04-16 08:44:31 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
 
 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
@@ -71,7 +68,7 @@ struct data1_attset_child {
 struct data1_attset
 {
     char *name;          /* symbolic name */
-    int *oid;            /* attribute set OID */
+    Odr_oid *oid;        /* attribute set OID */
     data1_att *atts;          /* attributes */
     data1_attset_child *children;  /* included attset */
     data1_attset *next;       /* next in cache */
@@ -100,23 +97,18 @@ typedef struct data1_maptag
     struct data1_maptag *next;
 } data1_maptag;
 
-typedef struct data1_mapunit
-{
-    int no_data;
-    char *source_element_name;
-    data1_maptag *target_path;
-    struct data1_mapunit *next;
-} data1_mapunit;
+typedef struct data1_mapunit data1_mapunit;
 
 typedef struct data1_maptab
 {
     char *name;
-    int *oid;  /* target abstract syntax  */
+    Odr_oid *oid;  /* target abstract syntax  */
     char *target_absyn_name;
     data1_mapunit *map;
     struct data1_maptab *next;
 } data1_maptab;
 
+
 typedef struct data1_name
 {
     char *name;
@@ -145,7 +137,7 @@ typedef enum data1_datatype
 typedef struct data1_marctab
 {
     char *name;
-    int *oid; /* MARC OID */
+    Odr_oid *oid; /* MARC OID */
 
     char record_status[2];
     char implementation_codes[5];
@@ -196,7 +188,7 @@ typedef struct data1_varclass
 typedef struct data1_varset
 {
     char *name;
-    int *oid; /* variant OID */
+    Odr_oid *oid; /* variant OID */
     data1_varclass *classes;
 } data1_varset;
 
@@ -229,7 +221,7 @@ struct data1_tagset
 {
     int type;                        /* type of tagset in current context */
     char *name;                      /* symbolic name */
-    int *oid;                        /* variant OID */
+    Odr_oid *oid;                        /* variant OID */
     data1_tag *tags;                 /* tags defined by this set */
     data1_tagset *children;          /* children */
     data1_tagset *next;              /* sibling */
@@ -542,7 +534,7 @@ YAZ_EXPORT void data1_absyn_trav (data1_handle dh, void *handle,
 					     void *h, data1_absyn *a));
 
 YAZ_EXPORT data1_attset *data1_attset_search_id (data1_handle dh,
-                                                 const int *oid);
+                                                 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);
@@ -578,6 +570,7 @@ 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);