Use YAZ backtrace facility MP-582

diff --git a/configure.ac b/configure.ac
index a22f3d0..8f44b2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,11 +45,11 @@ if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 CPPFLAGS="$YAZPPINC $CPPFLAGS"
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 CPPFLAGS="$YAZPPINC $CPPFLAGS"

-AC_MSG_CHECKING([if YAZ is version 5.5.0 or later])
+AC_MSG_CHECKING([if YAZ is version 5.7.0 or later])

 AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([[#include <yaz/yaz-version.h>]],
                          [[
 AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([[#include <yaz/yaz-version.h>]],
                          [[

-#if YAZ_VERSIONL < 0x50500
+#if YAZ_VERSIONL < 0x50700

 #error too old
 #endif
 ]])],
 #error too old
 #endif
 ]])],

diff --git a/debian/control b/debian/control
index 4689a74..583cb56 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Standards-Version: 3.6.2
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
 Build-Depends: debhelper (>= 7),
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
 Build-Depends: debhelper (>= 7),

-       libyaz5-dev (>= 5.5.0),
+       libyaz5-dev (>= 5.7.0),

        libyazpp6-dev (>= 1.6.0),
        libxslt1-dev,
        libboost-dev,
        libyazpp6-dev (>= 1.6.0),
        libxslt1-dev,
        libboost-dev,

@@ -24,7 +24,7 @@ Description: Z39.50/SRU router (main executable)
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web

- service SRU as well as functioning as a limited HTTP server. 
+ service SRU as well as functioning as a limited HTTP server.

  .
  This package includes the main Metaproxy executable.
 
  .
  This package includes the main Metaproxy executable.
 

@@ -37,7 +37,7 @@ Description: Z39.50/SRU router (runtime)
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web

- service SRU as well as functioning as a limited HTTP server. 
+ service SRU as well as functioning as a limited HTTP server.

  .
  This package includes the Metaproxy libraries.
 
  .
  This package includes the Metaproxy libraries.
 

@@ -50,7 +50,7 @@ Description: debugging symbols for libmetaproxy6
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web

- service SRU as well as functioning as a limited HTTP server. 
+ service SRU as well as functioning as a limited HTTP server.

  .
  This package contains the debugging symbols for libmetaproxy6.
 
  .
  This package contains the debugging symbols for libmetaproxy6.
 

@@ -74,7 +74,7 @@ Description: Z39.50/SRU router (development)
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web

- service SRU as well as functioning as a limited HTTP server. 
+ service SRU as well as functioning as a limited HTTP server.

  .
  This package includes development libraries and C++ header files.
 
  .
  This package includes development libraries and C++ header files.
 

@@ -86,6 +86,6 @@ Description: Z39.50/SRU router (documentation)
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web
  for information retrieval protocols. It accepts, processes, interprets
  and redirects requests from IR clients using standard protocols such as
  the binary ANSI/NISO Z39.50  and the information search and retrieval web

- service SRU as well as functioning as a limited HTTP server. 
+ service SRU as well as functioning as a limited HTTP server.

  .
  This package includes HTML documentation for Metaproxy.
  .
  This package includes HTML documentation for Metaproxy.

diff --git a/metaproxy.spec b/metaproxy.spec
index 8824750..2f973f9 100644 (file)
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -9,7 +9,7 @@ Vendor: Index Data ApS <info@indexdata.dk>
 Source: metaproxy-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
 Source: metaproxy-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy

-BuildRequires: pkgconfig, libyaz5-devel >= 5.5.0, libyazpp6-devel >= 1.6.0
+BuildRequires: pkgconfig, libyaz5-devel >= 5.7.0, libyazpp6-devel >= 1.6.0

 BuildRequires: libxslt-devel, boost-devel
 Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 BuildRequires: libxslt-devel, boost-devel
 Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>

@@ -31,7 +31,7 @@ Metaproxy documentation.
 %package -n libmetaproxy6
 Summary: Metaproxy library
 Group: Libraries
 %package -n libmetaproxy6
 Summary: Metaproxy library
 Group: Libraries

-Requires: libyazpp6 >= 1.6.0, libyaz5 >= 5.5.0
+Requires: libyazpp6 >= 1.6.0, libyaz5 >= 5.7.0

 
 %description -n libmetaproxy6
 The Metaproxy libraries.
 
 %description -n libmetaproxy6
 The Metaproxy libraries.

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 5d176ae..170e923 100644 (file)
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/daemon.h>
 
 #include <yaz/sc.h>
 #include <yaz/daemon.h>
 
 #include <yaz/sc.h>

+#include <yaz/backtrace.h>

 #include <iostream>
 #include <stdexcept>
 #include <libxml/xinclude.h>
 #include <iostream>
 #include <stdexcept>
 #include <libxml/xinclude.h>

@@ -123,6 +124,7 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
 
     const char *pidfile = 0;
     const char *uid = 0;
 

+    yaz_enable_panic_backtrace(argv[0]);

     set_log_prefix();
 
     while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",
     set_log_prefix();
 
     while ((ret = options("c{config}:Dh{help}l:m:p:tu:v:V{version}w:X",