Use yazpp rather than yaz++.

diff --git a/debian/control b/debian/control
index 9ba5796..f569b7f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: yazproxy
 Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Standards-Version: 3.6.0
 Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Standards-Version: 3.6.0

-Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.0.9), libyaz++-dev(>= 0.9)
+Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.0.9), libyazpp1-dev(>= 1.0)

 
 Package: yazproxy
 Section: utils
 
 Package: yazproxy
 Section: utils

@@ -17,7 +17,7 @@ Description: YAZ Proxy.
 Package: libyazproxy
 Section: libs
 Architecture: any
 Package: libyazproxy
 Section: libs
 Architecture: any

-Depends: ${shlibs:Depends}, libyaz++ (>= 0.9)
+Depends: ${shlibs:Depends}, libyazpp1 (>= 1.0)

 Description: YAZ Proxy libraries.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities
 Description: YAZ Proxy libraries.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities

@@ -27,7 +27,7 @@ Description: YAZ Proxy libraries.
 Package: libyazproxy-dev
 Section: devel
 Architecture: any
 Package: libyazproxy-dev
 Section: devel
 Architecture: any

-Depends: libyazproxy (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyaz++-dev, libyaz-dev
+Depends: libyazproxy (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyazpp1-dev, libyaz-dev

 Description: YAZ Proxy development libraries.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities
 Description: YAZ Proxy development libraries.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities

diff --git a/etc/config.xml b/etc/config.xml
index 80aa370..9925858 100644 (file)
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: config.xml,v 1.13 2005-06-21 18:46:04 adam Exp $ -->
+<!-- $Id: config.xml,v 1.14 2006-03-29 13:33:46 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@@ -25,6 +25,9 @@
     <syntax type="usmarc" backendcharset="iso-8859-1"/>
     <syntax type="none"/>
     <syntax type="sutrs" backendcharset="iso-8859-1"/>
     <syntax type="usmarc" backendcharset="iso-8859-1"/>
     <syntax type="none"/>
     <syntax type="sutrs" backendcharset="iso-8859-1"/>

+    <syntax type="xml">
+      <name>b</name>
+    </syntax>

     <syntax type="xml" marcxml="1" stylesheet="MARC21slim2SRWDC.xsl"
       identifier="info:srw/schema/1/dc-v1.1"
       >
     <syntax type="xml" marcxml="1" stylesheet="MARC21slim2SRWDC.xsl"
       identifier="info:srw/schema/1/dc-v1.1"
       >

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index 5a6ae44..fb470cb 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,4 +1,4 @@
-/* $Id: proxy.h,v 1.27 2006-03-25 10:59:14 adam Exp $
+/* $Id: proxy.h,v 1.28 2006-03-29 13:33:46 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -22,14 +22,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef YAZ_PROXY_H_INCLUDED
 #define YAZ_PROXY_H_INCLUDED
 
 #ifndef YAZ_PROXY_H_INCLUDED
 #define YAZ_PROXY_H_INCLUDED
 

-#include <yaz++/socket-observer.h>
-#include <yaz++/z-assoc.h>
-#include <yaz++/z-query.h>
-#include <yaz++/z-databases.h>
-#include <yaz++/cql2rpn.h>
+#include <yazpp/socket-observer.h>
+#include <yazpp/z-assoc.h>
+#include <yazpp/z-query.h>
+#include <yazpp/z-databases.h>
+#include <yazpp/cql2rpn.h>

 #include <yaz/cql.h>
 #include <yaz/cql.h>

-#include <yaz++/gdu.h>
-#include <yaz++/gduqueue.h>
+#include <yazpp/gdu.h>
+#include <yazpp/gduqueue.h>

 #include <yazproxy/bw.h>
 
 class Yaz_Proxy;
 #include <yazproxy/bw.h>
 
 class Yaz_Proxy;

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 224176f..17029ec 100644 (file)
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.10 2005-10-05 12:05:40 adam Exp $
+/* $Id: msg-thread.cpp,v 1.11 2006-03-29 13:33:47 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -23,7 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 #include <stdio.h>
 
 #include <ctype.h>
 #include <stdio.h>
 

-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>

 #include <yaz/log.h>
 
 #include "msg-thread.h"
 #include <yaz/log.h>
 
 #include "msg-thread.h"

diff --git a/src/msg-thread.h b/src/msg-thread.h
index b4c39de..38f5e71 100644 (file)
--- a/src/msg-thread.h
+++ b/src/msg-thread.h
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.h,v 1.7 2005-09-26 09:22:59 adam Exp $
+/* $Id: msg-thread.h,v 1.8 2006-03-29 13:33:47 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <dlfcn.h>
 #endif
 
 #include <dlfcn.h>
 #endif
 

-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>

 #include <yaz/yconfig.h>
 
 class IMsg_Thread {
 #include <yaz/yconfig.h>
 
 class IMsg_Thread {

diff --git a/src/proxyp.h b/src/proxyp.h
index 08af5f0..b161fdf 100644 (file)
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,4 +1,4 @@
-/* $Id: proxyp.h,v 1.12 2006-03-25 10:59:14 adam Exp $
+/* $Id: proxyp.h,v 1.13 2006-03-29 13:33:47 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -31,7 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <objectlist.h>
 #endif
 
 #include <objectlist.h>
 #endif
 

-#include <yaz++/record-cache.h>
+#include <yazpp/record-cache.h>

 #include <yazproxy/proxy.h>
 #include <yazproxy/module.h>
 
 #include <yazproxy/proxy.h>
 #include <yazproxy/module.h>
 

diff --git a/src/t-server.cpp b/src/t-server.cpp
index 960e4cb..3a4acef 100644 (file)
--- a/src/t-server.cpp
+++ b/src/t-server.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2005, Index Data.
  * See the file LICENSE for details.
  * 
  * Copyright (c) 2005, Index Data.
  * See the file LICENSE for details.
  * 

- * $Id: t-server.cpp,v 1.7 2005-10-13 09:58:52 adam Exp $
+ * $Id: t-server.cpp,v 1.8 2006-03-29 13:33:47 adam Exp $

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

@@ -11,11 +11,11 @@
 #include <yaz/diagbib1.h>
 #include <yaz/options.h>
 #include "msg-thread.h"
 #include <yaz/diagbib1.h>
 #include <yaz/options.h>
 #include "msg-thread.h"

-#include <yaz++/z-assoc.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/gdu.h>
-#include <yaz++/gduqueue.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/z-assoc.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/gdu.h>
+#include <yazpp/gduqueue.h>
+#include <yazpp/socket-manager.h>

 
 using namespace yazpp_1;
 
 
 using namespace yazpp_1;
 

diff --git a/src/tstthreads.cpp b/src/tstthreads.cpp
index bbbb865..83af4de 100644 (file)
--- a/src/tstthreads.cpp
+++ b/src/tstthreads.cpp
@@ -1,4 +1,4 @@
-/* $Id: tstthreads.cpp,v 1.8 2005-10-05 12:05:59 adam Exp $
+/* $Id: tstthreads.cpp,v 1.9 2006-03-29 13:33:48 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -22,8 +22,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <ctype.h>
 
 #include <stdlib.h>
 #include <ctype.h>
 

-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>

 #include <yaz/log.h>
 #include "msg-thread.h"
 
 #include <yaz/log.h>
 #include "msg-thread.h"
 

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index b5f3ffe..5210d36 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-main.cpp,v 1.17 2005-09-07 09:28:46 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.18 2006-03-29 13:33:48 adam Exp $

    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.

@@ -45,8 +45,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/log.h>
 #include <yaz/options.h>
 
 #include <yaz/log.h>
 #include <yaz/options.h>
 

-#include <yaz++/socket-manager.h>
-#include <yaz++/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yazpp/pdu-assoc.h>

 #include <yazproxy/proxy.h>
 
 #if HAVE_XSLT
 #include <yazproxy/proxy.h>
 
 #if HAVE_XSLT

diff --git a/yazpp.m4 b/yazpp.m4
index 63be11e..cf121a0 100644 (file)
--- a/yazpp.m4
+++ b/yazpp.m4
@@ -6,24 +6,24 @@ AC_DEFUN([YAZPP_INIT],
         AC_SUBST(YAZPPVERSION)
         yazppconfig=NONE
         yazpppath=NONE
         AC_SUBST(YAZPPVERSION)
         yazppconfig=NONE
         yazpppath=NONE

-        AC_ARG_WITH(yazpp, [  --with-yazpp=DIR        yaz++-config in DIR (example /home/yaz++-0.8)], [yazpppath=$withval])
+        AC_ARG_WITH(yazpp, [  --with-yazpp=DIR        yazpp-config in DIR (example /home/yazpp-1.0.0)], [yazpppath=$withval])

         if test "x$yazpppath" != "xNONE"; then
         if test "x$yazpppath" != "xNONE"; then

-                yazppconfig=$yazpppath/yaz++-config
+                yazppconfig=$yazpppath/yazpp-config

         else
                 if test "x$srcdir" = "x"; then
                         yazppsrcdir=.
                 else
                         yazppsrcdir=$srcdir
                 fi
         else
                 if test "x$srcdir" = "x"; then
                         yazppsrcdir=.
                 else
                         yazppsrcdir=$srcdir
                 fi

-                for i in ${yazppsrcdir}/../../yaz++ ${yazppsrcdir}/../yaz++-* ${yazppsrcdir}/../yaz++; do
+                for i in ${yazppsrcdir}/../../yazpp ${yazppsrcdir}/../yazpp-* ${yazppsrcdir}/../yazpp; do

                         if test -d $i; then
                         if test -d $i; then

-                                if test -r $i/yaz++-config; then
-                                        yazppconfig=$i/yaz++-config
+                                if test -r $i/yazpp-config; then
+                                        yazppconfig=$i/yazpp-config

                                 fi
                         fi
                 done
                 if test "x$yazppconfig" = "xNONE"; then
                                 fi
                         fi
                 done
                 if test "x$yazppconfig" = "xNONE"; then

-                        AC_PATH_PROG(yazppconfig, yaz++-config, NONE)
+                        AC_PATH_PROG(yazppconfig, yazpp-config, NONE)

                 fi
         fi
         AC_MSG_CHECKING(for YAZ++)
                 fi
         fi
         AC_MSG_CHECKING(for YAZ++)