X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fd1_absyn.h;h=44a3a03746cbca98c3638a5a6985f90ff1899f11;hp=20d5669187ae190d60ae88016838b67fb0d8898c;hb=20e2d608e0cd383054e627db00264388affb58cd;hpb=396e9aaedfbed7534e329b42475cd7abe2fd3814

diff --git a/include/d1_absyn.h b/include/d1_absyn.h
index 20d5669..44a3a03 100644
--- a/include/d1_absyn.h
+++ b/include/d1_absyn.h
@@ -1,8 +1,5 @@
-/* $Id: d1_absyn.h,v 1.7 2006-09-28 18:38:46 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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
@@ -33,23 +30,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 typedef struct data1_xpelement
 {
     char *xpath_expr;
-#ifdef ENHANCED_XELM 
+#ifdef ENHANCED_XELM
     struct xpath_location_step xpath[XPATH_STEP_COUNT];
     int xpath_len;
 #endif
-    struct DFA *dfa;  
+    struct DFA *dfa;
     data1_termlist *termlists;
     struct data1_xpelement *next;
 #if OPTIMIZE_MELM
     const char *regexp;
 #endif
     int match_state;
+    struct data1_xpelement *match_next;
 } data1_xpelement;
 
 struct data1_absyn
 {
     char *name;
-    oid_value reference;
+    Odr_oid *oid;
     data1_tagset *tagset;
     data1_varset *varset;
     data1_esetname *esetnames;
@@ -67,6 +65,7 @@ struct data1_absyn
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab