Fix attributes for MARC reader

diff --git a/CHANGELOG b/CHANGELOG
index 4d81c53..3d3141a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,19 +1,5 @@
 
---- 1.2.0 2002/04/05
-
-Multiple registers. New setting in resource 'root' that holds base
-directory for register(s). A group a databases may be put in separate
-register in directory root/reg by using db name 'reg/db1' ... 'reg/dbN'.
-
---- 1.1.1 2002/03/21
-
-Fixes for Digital Unix
-
-Implemented hits per term using USR:SearchResult-1.
-
-New Zebra API. Locking system re-implemented.
-
---- 1.1.stable 2002/02/20
+Fix XML attributes for MARC reader.
 
 Rank weight can be controlled with attribute type 9. Default
 value is 34. Recommended values between 1-36.

diff --git a/configure.in b/configure.in
index b9ba2f9..63f7958 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-dnl Zebra, Index Data Aps, 1994-2002
-dnl $Id: configure.in,v 1.36 2002-04-08 19:52:29 adam Exp $
+dnl Zebra, Index Data Aps, 1994-2000
+dnl $Id: configure.in,v 1.29.2.1 2002-04-09 14:55:40 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
 AC_MSG_CHECKING(for package)
@@ -7,15 +7,28 @@ if test -r ${srcdir}/LICENSE.zmbol; then
        AC_MSG_RESULT([Z'mbol])
        PROGPREFIX=zmbol
        AC_DEFINE(ZMBOL,1)
-       AM_INIT_AUTOMAKE(zmbol,1.2.0)
+       AM_INIT_AUTOMAKE(zmbol,1.1.1)
 else
        AC_MSG_RESULT([Zebra])
        PROGPREFIX=zebra
        AC_DEFINE(ZMBOL,0)
-       AM_INIT_AUTOMAKE(zebra,1.2.0)
+       AM_INIT_AUTOMAKE(zebra,1.1.1)
+       if test ! -r ${srcdir}/isam; then
+               mkdir ${srcdir}/isam
+       fi
+       touch ${srcdir}/isam/Makefile.in
+       if test ! -r ${srcdir}/isamc; then
+               mkdir ${srcdir}/isamc
+       fi
+       touch ${srcdir}/isamc/Makefile.in
+       if test ! -r ${srcdir}/isamb; then
+               mkdir ${srcdir}/isamb
+       fi
+       touch ${srcdir}/isamb/Makefile.in
 fi
 AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol)
 dnl ------ Substitutions
+AC_SUBST(DEFS)
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
 AC_SUBST(PROGPREFIX)
@@ -25,54 +38,7 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-           /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbook.dsl],
-[
-   if test -f "$withval/html/docbook.dsl"; then
-      DSSSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-dnl
+
 YAZ_INIT(threads)
 dnl
 dnl ------ Look for Tcl
@@ -95,10 +61,7 @@ if test -r ${tclconfig}/tclConfig.sh; then
        if test -r ${tclconfig}/../generic/tcl.h; then
                TCL_INCLUDE=-I${tclconfig}/../generic
                TCL_LIB="$TCL_BUILD_LIB_SPEC $TCL_LIBS"
-       elif test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
-               TCL_INCLUDE=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}
-               TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS"
-       else
+       else
                TCL_INCLUDE=-I${TCL_PREFIX}/include
                TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS"
        fi
@@ -115,8 +78,6 @@ fi
 dnl
 dnl ------ times
 AC_CHECK_HEADERS(sys/times.h)
-dnl ------ mkstemp
-AC_CHECK_FUNCS(mkstemp)
 dnl
 dnl ------- BZIP2
 AC_CHECK_LIB(bz2,bzCompressInit)
@@ -191,9 +152,5 @@ AC_OUTPUT([
   include/Makefile
   tab/Makefile
   doc/Makefile
-  doc/zebra.xml
-  doc/zebrahtml.dsl
-  doc/zebraprint.dsl
-  doc/zebraphp.dsl
-  test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
+  test/Makefile test/gils/Makefile test/usmarc/Makefile
 ])

diff --git a/include/zebraver.h b/include/zebraver.h
index 62a5c36..b25fa75 100644 (file)
--- a/include/zebraver.h
+++ b/include/zebraver.h
@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 1994-2002, Index Data
+ * Copyright (C) 1994-2001, Index Data
  * All rights reserved.
  *
- * $Id: zebraver.h,v 1.20 2002-04-05 08:46:26 adam Exp $
+ * $Id: zebraver.h,v 1.18.2.1 2002-04-09 14:55:40 adam Exp $
  */
 
 #ifndef ZEBRAVER
-#define ZEBRAVER "1.2.0"
+#define ZEBRAVER "1.1.1"
 #endif
 
 #ifndef ZEBRADATE
-#define ZEBRADATE "$Date: 2002-04-05 08:46:26 $"
+#define ZEBRADATE "$Date: 2002-04-09 14:55:40 $"
 #endif

diff --git a/recctrl/marcread.c b/recctrl/marcread.c
index 7e072aa..5783f63 100644 (file)
--- a/recctrl/marcread.c
+++ b/recctrl/marcread.c
@@ -4,8 +4,8 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcread.c,v $
- * Revision 1.12  2002-04-09 14:36:53  adam
- * Fix XML attributes for MARC reader
+ * Revision 1.11.2.1  2002-04-09 14:55:40  adam
+ * Fix attributes for MARC reader
  *
  * Revision 1.11  2000/05/15 15:32:51  adam
  * Added support for 64 bit input file support.
@@ -109,12 +109,12 @@ data1_node *data1_mk_node_tag (data1_handle dh, NMEM mem, data1_node *parent,
     res->which = DATA1N_tag;
     res->u.tag.tag = res->lbuf;
     res->u.tag.get_bytes = -1;
-#if DATA1_USING_XATTR
-    res->u.tag.attributes = 0;
-#endif
 
     if (len >= DATA1_LOCALDATA)
         len = DATA1_LOCALDATA-1;
+#if DATA1_USING_XATTR
+    res->u.tag.attributes = 0;
+#endif
 
     memcpy (res->u.tag.tag, tag, len);
     res->u.tag.tag[len] = '\0';

diff --git a/zebra.spec b/zebra.spec
index 42e0307..8428878 100644 (file)
--- a/zebra.spec
+++ b/zebra.spec
@@ -1,5 +1,5 @@
 Name: zebra
-Version: 1.2.0
+Version: 1.1.1
 Release: 1
 Requires: yaz
 Copyright: Distributable

diff --git a/zmbol.spec b/zmbol.spec
new file mode 100644 (file)
index 0000000..61bd9ec
--- /dev/null
+++ b/zmbol.spec
@@ -0,0 +1,39 @@
+Name: zmbol
+Version: 1.1.1
+Release: 1
+Requires: yaz
+Copyright: Commercial
+Group: Applications/Databases
+Vendor: Index Data ApS <info@indexdata.dk>
+Source: zmbol-%{version}.tar.gz
+BuildRoot: /var/tmp/%{name}-%{version}-root
+Packager: Adam Dickmeiss <adam@indexdata.dk>
+URL: http://www.indexdata.dk/zmbol/
+Summary: Z'mbol: a fielded free-text engine with a Z39.50 frontend.
+
+%description
+Zmbol is a fielded free-text indexing and retrieval engine with a Z39.50
+frontend. You can use any compatible, commercial or freeware Z39.50 client to
+access data stored in Zmbol.
+
+%prep
+%setup
+
+%build
+
+CFLAGS="$RPM_OPT_FLAGS" \
+ ./configure --prefix=/usr --with-yazconfig=/usr/bin
+make CFLAGS="$RPM_OPT_FLAGS"
+
+%install
+rm -fr $RPM_BUILD_ROOT
+make prefix=$RPM_BUILD_ROOT/usr install
+cd doc; make prefix=$RPM_BUILD_ROOT/usr install
+
+%files
+%defattr(-,root,root)
+%doc README LICENSE.zmbol CHANGELOG 
+%config /usr/share/zmbol/tab
+/usr/bin/zmbolsrv
+/usr/bin/zmbolidx
+/usr/share/zmbol/doc