From 066ce352a46a7e50987bab404994d199eef748ff Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 30 Oct 2002 14:35:08 +0000
Subject: [PATCH] If installed, Zebra can operate without profilePath setting

---
 CHANGELOG               |    4 ++++
 doc/quickstart.xml      |    4 ++--
 examples/gils/zebra.cfg |   13 +++++++++++++
 index/Makefile.am       |    4 ++--
 index/zebraapi.c        |    5 +++--
 util/Makefile.am        |    4 ++--
 util/zebramap.c         |    5 +++--
 7 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 examples/gils/zebra.cfg

diff --git a/CHANGELOG b/CHANGELOG
index 7e8754b..569a76e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 
+For zebra.cfg, if no profilePath is specified, directory
+ (prefix)/share/idzebra/tab
+is used.
+
 Zebra Examples in examples . Zebra tests in test.
 
 Bug fix: sort index was not properly modified on 
diff --git a/doc/quickstart.xml b/doc/quickstart.xml
index cb1f7a4..d7f0d00 100644
--- a/doc/quickstart.xml
+++ b/doc/quickstart.xml
@@ -1,5 +1,5 @@
 <chapter id="quick-start">
- <!-- $Id: quickstart.xml,v 1.6 2002-10-30 13:59:42 adam Exp $ -->
+ <!-- $Id: quickstart.xml,v 1.7 2002-10-30 14:35:09 adam Exp $ -->
  <title>Quick Start </title>
  
  <!--
@@ -17,7 +17,7 @@
   
   <screen>
    # Where the schema files, attribute files, etc are located.
-   profilePath: .:../../tab
+   profilePath: ../../tab
 
    # Files that describe the attribute sets supported.
    attset: bib1.att
diff --git a/examples/gils/zebra.cfg b/examples/gils/zebra.cfg
new file mode 100644
index 0000000..44972ed
--- /dev/null
+++ b/examples/gils/zebra.cfg
@@ -0,0 +1,13 @@
+# Simple Zebra configuration file
+# $Id: zebra.cfg,v 1.1 2002-10-30 14:35:09 adam Exp $
+#
+# Where the schema files, attribute files, etc are located.
+profilePath: ../../tab
+
+# Files that describe the attribute sets supported.
+attset: bib1.att
+attset: gils.att
+attset: explain.att
+
+recordtype: grs.sgml
+isam: c
diff --git a/index/Makefile.am b/index/Makefile.am
index 623cb93..069b8bd 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.15 2002-10-22 12:51:08 adam Exp $
+## $Id: Makefile.am,v 1.16 2002-10-30 14:35:09 adam Exp $
 
 noinst_PROGRAMS = apitest kdump
 
@@ -23,7 +23,7 @@ zebrasrv_SOURCES = zserver.c
 apitest_SOURCES = apitest.c
 kdump_SOURCES=kdump.c kcompare.c
 
-AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE)
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 
 LDADD = libzebra.a $(YAZLIB) $(TCL_LIB)
 
diff --git a/index/zebraapi.c b/index/zebraapi.c
index f74eae4..02fa99d 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.75 2002-10-23 14:28:20 adam Exp $
+/* $Id: zebraapi.c,v 1.76 2002-10-30 14:35:09 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -193,7 +193,8 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     }
     if (useshadow)
         bf_cache (reg->bfs, res_get (res, "shadow"));
-    data1_set_tabpath (reg->dh, res_get(res, "profilePath"));
+    data1_set_tabpath (reg->dh, res_get_def(res, "profilePath",
+                                            DEFAULT_PROFILE_PATH));
     data1_set_tabroot (reg->dh, reg_path);
     reg->recTypes = recTypes_init (reg->dh);
     recTypes_default_handlers (reg->recTypes);
diff --git a/util/Makefile.am b/util/Makefile.am
index a701ad1..5c859a2 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2002-08-17 08:00:28 adam Exp $
+## $Id: Makefile.am,v 1.6 2002-10-30 14:35:09 adam Exp $
 
 noinst_LIBRARIES = libutil.a
 
@@ -6,7 +6,7 @@ noinst_PROGRAMS = passtest
 
 EXTRA_DIST = zebrasrv.rh
 
-INCLUDES = -I$(srcdir)/../include @YAZINC@
+AM_CPPFLAGS = -I$(srcdir)/../include @YAZINC@ -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 LDADD = libutil.a $(YAZLIB) $(TCL_LIB)
 
 libutil_a_SOURCES = res.c charmap.c zebramap.c passwddb.c zebra-lock.c dirent.c
diff --git a/util/zebramap.c b/util/zebramap.c
index e12b445..20a96bc 100644
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,4 +1,4 @@
-/* $Id: zebramap.c,v 1.27 2002-08-02 19:26:57 adam Exp $
+/* $Id: zebramap.c,v 1.28 2002-10-30 14:35:09 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -225,7 +225,8 @@ ZebraMaps zebra_maps_open (Res res, const char *base)
 
     zms->nmem = nmem_create ();
     zms->tabpath = nmem_strdup (zms->nmem,
-				res_get_def (res, "profilePath", "."));
+				res_get_def (res, "profilePath",
+                                             DEFAULT_PROFILE_PATH));
     zms->tabroot = 0;
     if (base)
         zms->tabroot = nmem_strdup (zms->nmem, base);
-- 
1.7.10.4