X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fd1_absyn.h;h=31d69f3a0f8e7178e439da26fe5451bca474848c;hb=33ae4eec22d719299cb2c4e2a3853bde0c1f5794;hp=e14740034bcb38441535a961dd2cddb4d654c560;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/include/d1_absyn.h b/include/d1_absyn.h
index e147400..31d69f3 100644
--- a/include/d1_absyn.h
+++ b/include/d1_absyn.h
@@ -1,8 +1,5 @@
-/* $Id: d1_absyn.h,v 1.6 2006-08-14 10:40:12 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-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
@@ -24,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define D1_ABSYN_H 1
 
 #define ENHANCED_XELM 1
+#define OPTIMIZE_MELM 1
 
 #include <zebra_xpath.h>
 #include <idzebra/data1.h>
@@ -39,12 +37,17 @@ typedef struct data1_xpelement
     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