Made zebramap.h public too

diff --git a/include/Makefile.am b/include/Makefile.am
index 03033f7..9907b9b 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
-# $Id: Makefile.am,v 1.16 2004-09-28 10:43:37 adam Exp $
+# $Id: Makefile.am,v 1.17 2004-09-28 12:39:54 adam Exp $
 noinst_HEADERS = bfile.h bset.h charmap.h  \
 dict.h direntz.h isam-codec.h isamb.h isamc.h isamg.h \
 isams.h mfile.h passwddb.h dfa.h zebra_xpath.h d1_absyn.h \
-rset.h set.h sortidx.h str.h zebra-lock.h zebramap.h zebrautl.h
+rset.h set.h sortidx.h str.h zebra-lock.h zebrautl.h
 
 SUBDIRS = idzebra

diff --git a/include/idzebra/Makefile.am b/include/idzebra/Makefile.am
index 4c20d40..1b59ed1 100644 (file)
--- a/include/idzebra/Makefile.am
+++ b/include/idzebra/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.2 2004-09-28 10:15:03 adam Exp $
+# $Id: Makefile.am,v 1.3 2004-09-28 12:39:54 adam Exp $
 
-pkginclude_HEADERS=api.h version.h res.h recctrl.h data1.h recgrs.h
+pkginclude_HEADERS=api.h version.h res.h recctrl.h data1.h recgrs.h zebramap.h
 

diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h
index b9f8d3c..0ded57d 100644 (file)
--- a/include/idzebra/recctrl.h
+++ b/include/idzebra/recctrl.h
@@ -1,4 +1,4 @@
-/* $Id: recctrl.h,v 1.1 2004-09-28 10:15:03 adam Exp $
+/* $Id: recctrl.h,v 1.2 2004-09-28 12:39:54 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -30,7 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/odr.h>
 #include <idzebra/res.h>
 #include <idzebra/data1.h>
-#include <zebramap.h>
+#include <idzebra/zebramap.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/idzebra/zebramap.h b/include/idzebra/zebramap.h
new file mode 100644 (file)
index 0000000..876ad6b
--- /dev/null
+++ b/include/idzebra/zebramap.h
@@ -0,0 +1,56 @@
+/* $Id: zebramap.h,v 1.1 2004-09-28 12:39:54 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+#ifndef ZEBRAMAP_H
+#define ZEBRAMAP_H
+
+#include <yaz/proto.h>
+#include <idzebra/res.h>
+
+YAZ_BEGIN_CDECL
+
+typedef struct zebra_maps *ZebraMaps;
+ZebraMaps zebra_maps_open (Res res, const char *base);
+
+void zebra_maps_close (ZebraMaps zm);
+
+const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
+                              const char **from, int len, int first);
+const char *zebra_maps_output(ZebraMaps, unsigned reg_id, const char **from);
+
+int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
+                    unsigned *reg_id, char **search_type, char *rank_type,
+                    int *complete_flag, int *sort_flag);
+
+int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes,
+                     int *numerical);
+
+int zebra_maps_is_complete (ZebraMaps zms, unsigned reg_id);
+int zebra_maps_is_sort (ZebraMaps zms, unsigned reg_id);
+int zebra_maps_is_positioned (ZebraMaps zms, unsigned reg_id);
+
+WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
+                   const char *input_str, int input_len);
+
+YAZ_END_CDECL
+
+#endif

diff --git a/include/zebramap.h b/include/zebramap.h
deleted file mode 100644 (file)
index ba7f1e4..0000000
--- a/include/zebramap.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id: zebramap.h,v 1.17 2004-09-14 14:38:07 quinn Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-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.
-*/
-
-#ifndef ZEBRAMAP_H
-#define ZEBRAMAP_H
-
-#include <yaz/proto.h>
-#include <idzebra/res.h>
-
-YAZ_BEGIN_CDECL
-
-typedef struct zebra_maps *ZebraMaps;
-ZebraMaps zebra_maps_open (Res res, const char *base);
-
-void zebra_maps_close (ZebraMaps zm);
-
-const char **zebra_maps_input (ZebraMaps zms, unsigned reg_id,
-                              const char **from, int len, int first);
-const char *zebra_maps_output(ZebraMaps, unsigned reg_id, const char **from);
-
-int zebra_maps_attr (ZebraMaps zms, Z_AttributesPlusTerm *zapt,
-                    unsigned *reg_id, char **search_type, char *rank_type,
-                    int *complete_flag, int *sort_flag);
-
-int zebra_maps_sort (ZebraMaps zms, Z_SortAttributes *sortAttributes,
-                     int *numerical);
-
-int zebra_maps_is_complete (ZebraMaps zms, unsigned reg_id);
-int zebra_maps_is_sort (ZebraMaps zms, unsigned reg_id);
-int zebra_maps_is_positioned (ZebraMaps zms, unsigned reg_id);
-
-WRBUF zebra_replace(ZebraMaps zms, unsigned reg_id, const char *ex_list,
-                   const char *input_str, int input_len);
-
-YAZ_END_CDECL
-
-#endif

diff --git a/index/index.h b/index/index.h
index cb934ec..0e873de 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.122 2004-09-28 10:15:03 adam Exp $
+/* $Id: index.h,v 1.123 2004-09-28 12:39:55 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -26,7 +26,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <time.h>
 #include <idzebra/version.h>
 #include <zebrautl.h>
-#include <zebramap.h>
 #include <sortidx.h>
 
 #if HAVE_SYS_TIMES_H

diff --git a/util/zebramap.c b/util/zebramap.c
index 4116e52..ab9ca86 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,4 +1,4 @@
-/* $Id: zebramap.c,v 1.33 2004-09-14 14:38:08 quinn Exp $
+/* $Id: zebramap.c,v 1.34 2004-09-28 12:39:55 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/yaz-util.h>
 #include <charmap.h>
-#include <zebramap.h>
+#include <idzebra/zebramap.h>
 
 #define ZEBRA_MAP_TYPE_SORT  1
 #define ZEBRA_MAP_TYPE_INDEX 2