X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fidzebra%2Fdata1.h;h=5ff471747aa80feb70c1b4cb99c18366ab08d405;hb=16853a7593f10680ea8d6895aa0720b9af3779e6;hp=f41a7700f3f6979dfe84a1e3415e677fa214cc65;hpb=5a8a42bede922e70156e7b289db071592c71529b;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index f41a770..5ff4717 100644
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,8 +1,5 @@
-/* $Id: data1.h,v 1.21 2007-01-15 20:08:24 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-2010 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
@@ -26,7 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdio.h>
 
 #include <yaz/nmem.h>
-#include <yaz/oid.h>
 #include <yaz/proto.h>
 #include <yaz/yaz-util.h>
 
@@ -72,7 +68,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 */
@@ -101,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;
-    oid_value target_absyn_ref;
+    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;
@@ -146,7 +137,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];
@@ -197,7 +188,7 @@ typedef struct data1_varclass
 typedef struct data1_varset
 {
     char *name;
-    oid_value reference;
+    Odr_oid *oid; /* variant OID */
     data1_varclass *classes;
 } data1_varset;
 
@@ -230,7 +221,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 */
@@ -542,7 +533,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);
@@ -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);
 
@@ -589,6 +582,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab