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

diff --git a/include/d1_absyn.h b/include/d1_absyn.h
index e08a41b..83e9f5b 100644
--- a/include/d1_absyn.h
+++ b/include/d1_absyn.h
@@ -1,5 +1,5 @@
-/* $Id: d1_absyn.h,v 1.5 2006-06-13 12:02:03 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: d1_absyn.h,v 1.13 2007-05-08 12:50:03 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,15 +15,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>
@@ -39,12 +40,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;