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

diff --git a/include/d1_absyn.h b/include/d1_absyn.h
index e08a41b..44a3a03 100644
--- a/include/d1_absyn.h
+++ b/include/d1_absyn.h
@@ -1,8 +1,5 @@
-/* $Id: d1_absyn.h,v 1.5 2006-06-13 12:02:03 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
@@ -15,15 +12,16 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #ifndef D1_ABSYN_H
 #define D1_ABSYN_H 1
 
 #define ENHANCED_XELM 1
+#define OPTIMIZE_MELM 1
 
 #include <zebra_xpath.h>
 #include <idzebra/data1.h>
@@ -32,19 +30,24 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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;
@@ -62,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