Removed ursula dependancy.

diff --git a/configure.in b/configure.in
index 27a05c7..cbb90bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,6 @@ AC_OUTPUT([
        Makefile
        src/Makefile
        include/Makefile
-       include/yaz/Makefile
        include/yaz++/Makefile
        yaz++-config
        src/yaz++-config

diff --git a/include/Makefile.am b/include/Makefile.am
index 340c400..023dc50 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = yaz yaz++
+SUBDIRS = yaz++

diff --git a/include/yaz++/yaz-z-server.h b/include/yaz++/yaz-z-server.h
index 3f399c1..46654ae 100644 (file)
--- a/include/yaz++/yaz-z-server.h
+++ b/include/yaz++/yaz-z-server.h
@@ -2,11 +2,13 @@
  * Copyright (c) 2000-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.h,v 1.6 2001-04-04 14:02:49 adam Exp $
+ * $Id: yaz-z-server.h,v 1.7 2001-04-05 13:09:44 adam Exp $
  */
 
 #include <yaz++/yaz-z-assoc.h>
+#if HAVE_YAZ_URSULA_H
 #include <yaz/zes-ursula.h>
+#endif
 
 class Yaz_Z_Server;
 
@@ -32,6 +34,7 @@ class YAZ_EXPORT IYaz_Server_Facility {
 };
 
 
+#if HAVE_YAZ_URSULA_H
 class YAZ_EXPORT Yaz_Facility_Ursula : public IYaz_Server_Facility {
  public:
     virtual void ursula_service (Z_ExtendedServicesRequest *req,
@@ -43,7 +46,7 @@ class YAZ_EXPORT Yaz_Facility_Ursula : public IYaz_Server_Facility {
             Z_InitResponse *initResponse);
     int recv(Yaz_Z_Server *server, Z_APDU *apdu);
 };
-
+#endif
 
 class YAZ_EXPORT Yaz_Facility_ILL : public IYaz_Server_Facility {
  public:

diff --git a/src/Makefile.am b/src/Makefile.am
index 43f5cf4..76e2135 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2001-04-04 14:02:49 adam Exp $
+## $Id: Makefile.am,v 1.5 2001-04-05 13:09:44 adam Exp $
 
 INCLUDES=$(YAZINC) -I$(srcdir)/../include
 
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libyaz++.la
 libyaz___la_SOURCES=yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
        yaz-z-assoc.cpp yaz-proxy.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \
        yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \
-       yaz-z-server-ill.cpp zes-ursula.c yaz-z-server-ursula.cpp
+       yaz-z-server-ill.cpp 
 
 libyaz___la_LDFLAGS=-version-info 0:0:0
 
@@ -21,6 +21,3 @@ yaz_my_server_SOURCES=yaz-my-server.cpp yaz-marc-sample.cpp
 yaz_proxy_SOURCES=yaz-proxy-main.cpp
 
 LDADD=libyaz++.la $(YAZLALIB)
-
-zes-ursula.c $(top_srcdir)/include/yaz/zes-ursula.h: ursula.tcl ursula.asn
-       cd $(srcdir); ../../yaz/util/yaz-comp -d $(srcdir)/../../yaz/z39.50/z.tcl -d ursula.tcl -i yaz -I ../include ursula.asn

diff --git a/src/ursula.asn b/src/ursula.asn
deleted file mode 100644 (file)
index 38f8b1c..0000000
--- a/src/ursula.asn
+++ /dev/null
@@ -1,80 +0,0 @@
-ESFormat-Ursula
-{Z39-50-extendedService DBC(105) UrsulaItemOrder (1)} DEFINITIONS ::=
-  -- oid is 1.2.840.10003.9.1000.105.3
-BEGIN
-IMPORTS InternationalString FROM Z39-50-APDU-1995;
-
--- Ursula Reserveringer / bestillinger
-PDU ::= CHOICE {
-    request          [1] Request,
-    update           [2] Update,
-    reservation      [3] Reservation,
-    renewal          [4] Renewal
-}
-
--- Foresporgsel
-Request ::= SEQUENCE {
-    libraryNo        [1] IMPLICIT LibraryNo OPTIONAL,
-    borrowerTickerNo [2] IMPLICIT InternationalString OPTIONAL,
-    disposalType     [3] IMPLICIT DisposalType OPTIONAL,
-    lastUseDate      [4] IMPLICIT OCTET STRING OPTIONAL,
-    items            [5] IMPLICIT SEQUENCE OF RequestItem,
-    counter          [6] IMPLICIT ServiceCounter OPTIONAL,
-    priority         [7] IMPLICIT Priority OPTIONAL,
-    disposalNote     [8] IMPLICIT DisposalNote OPTIONAL,
-    overrule         [9] IMPLICIT BOOLEAN OPTIONAL
-}
-
--- Opdatering/sletning
-Update ::= SEQUENCE {
-    libraryNo        [1] IMPLICIT LibraryNo OPTIONAL,
-    disposalId       [2] IMPLICIT OCTET STRING OPTIONAL,
-    priority         [3] IMPLICIT Priority OPTIONAL,
-    counter          [4] IMPLICIT ServiceCounter OPTIONAL,
-    lastUseDate      [5] IMPLICIT OCTET STRING OPTIONAL,
-    disposalNote     [6] IMPLICIT DisposalNote OPTIONAL
-}
-
--- Eksemplarreserveringer
-Reservation ::= CHOICE {
-    request          [1] IMPLICIT RequestItem,
-    update           [2] IMPLICIT SEQUENCE OF UpdateItem,
-    del              [3] IMPLICIT DeleteItem
-}
-
--- Fornyelse
-Renewal ::= SEQUENCE {
-    libraryNo        [1] IMPLICIT LibraryNo OPTIONAL,
-    borrowerTicketNo [2] IMPLICIT BorrowerTicketNo OPTIONAL,
-    copies           [3] IMPLICIT SEQUENCE OF InternationalString OPTIONAL,
-    newReturnDate    [4] IMPLICIT InternationalString OPTIONAL,
-    overrule         [5] IMPLICIT BOOLEAN OPTIONAL
-}
-
-
-RequestItem ::= SEQUENCE {
-    id               [1] IMPLICIT OCTET STRING,
-    titlePartNo      [2] IMPLICIT InternationalString
-}
-
-UpdateItem ::= SEQUENCE {
-    copyNo           [1] IMPLICIT InternationalString,
-    adviceTxt        [2] IMPLICIT InternationalString
-}
-
-DeleteItem ::= SEQUENCE {
-    copyNo           [1] IMPLICIT InternationalString
-}
-
-DisposalType ::= OCTET STRING
-
-BorrowerTicketNo ::= InternationalString
-
-Priority ::= INTEGER
-
-ServiceCounter ::= INTEGER
-
-LibraryNo ::= InternationalString
-
-DisposalNote ::= InternationalString
-

diff --git a/src/ursula.tcl b/src/ursula.tcl
deleted file mode 100644 (file)
index ff65e29..0000000
--- a/src/ursula.tcl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id: ursula.tcl,v 1.1 2001-04-04 14:02:49 adam Exp $
-
-set prefix(ESFormat-Ursula) {z_Urs Z_Urs Z_Urs}
-
-set m ESFormat-Ursula
-set filename($m) zes-ursula

diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index 5ac5307..a25af48 100644 (file)
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-my-client.cpp,v $
- * Revision 1.2  2001-04-04 14:02:49  adam
+ * Revision 1.3  2001-04-05 13:09:44  adam
+ * Removed ursula dependancy.
+ *
+ * Revision 1.2  2001/04/04 14:02:49  adam
  * URSULA / Z-ruth service.
  *
  * Revision 1.1  2001/03/27 14:47:45  adam
@@ -75,7 +78,10 @@
 #include <yaz++/yaz-ir-assoc.h>
 #include <yaz++/yaz-pdu-assoc.h>
 #include <yaz++/yaz-socket-manager.h>
+
+#if HAVE_YAZ_URSULA_H
 #include <yaz/zes-ursula.h>
+#endif
 
 extern "C" {
 #if HAVE_READLINE_READLINE_H
@@ -129,7 +135,9 @@ public:
     int cmd_init(char *args);
     int cmd_format(char *args);
     int cmd_proxy(char *args);
+#if HAVE_YAZ_URSULA_H
     int cmd_ursula(char *args);
+#endif
 };
 
 
@@ -598,6 +606,7 @@ int MyClient::cmd_proxy(char *args)
     return 1;
 }
 
+#if HAVE_YAZ_URSULA_H
 int MyClient::cmd_ursula(char *args)
 {
     Z_APDU *apdu = create_Z_PDU(Z_APDU_extendedServicesRequest);
@@ -647,6 +656,7 @@ int MyClient::cmd_ursula(char *args)
        wait();
     return 1;
 }
+#endif
 
 int MyClient::processCommand(const char *commandLine)
 {
@@ -668,7 +678,9 @@ int MyClient::processCommand(const char *commandLine)
        {"init", &MyClient::cmd_init, ""},
        {"format", &MyClient::cmd_format, "<record-syntax>"},
        {"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
+#if HAVE_YAZ_URSULA_H
        {"ursula", &MyClient::cmd_ursula, ""},
+#endif
        {0,0,0}
     };
     

diff --git a/src/yaz-my-server.cpp b/src/yaz-my-server.cpp
index a9aeb0a..30c68cd 100644 (file)
--- a/src/yaz-my-server.cpp
+++ b/src/yaz-my-server.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-my-server.cpp,v $
- * Revision 1.3  2001-04-04 14:02:49  adam
+ * Revision 1.4  2001-04-05 13:09:44  adam
+ * Removed ursula dependancy.
+ *
+ * Revision 1.3  2001/04/04 14:02:49  adam
  * URSULA / Z-ruth service.
  *
  * Revision 1.2  2001/03/29 15:14:26  adam
@@ -94,12 +97,14 @@ public:
                    Z_Records *records);
 };
 
+#if HAVE_YAZ_URSULA_H
 class MyUrsula : public Yaz_Facility_Ursula {
 public:
     void ursula_service (Z_ExtendedServicesRequest *req,
                         Z_UrsPDU *u,
                         Z_ExtendedServicesResponse *res);
 };
+#endif
 
 class MyServer : public Yaz_Z_Server {
 public:
@@ -114,7 +119,9 @@ public:
 private:
     MyRetrieval m_retrieval;
     MyILL       m_ill;
+#if HAVE_YAZ_URSULA_H
     MyUrsula    m_ursula;
+#endif
     int m_no;
 };
 
@@ -133,6 +140,7 @@ void MyILL::ill_service (Z_ExtendedServicesRequest *req,
 }
 
 
+#if HAVE_YAZ_URSULA_H
 void MyUrsula::ursula_service (Z_ExtendedServicesRequest *req,
                               Z_UrsPDU *u,
                               Z_ExtendedServicesResponse *res)
@@ -159,6 +167,7 @@ void MyUrsula::ursula_service (Z_ExtendedServicesRequest *req,
        break;
     }
 }
+#endif
 
 int MyRetrieval::sr_init (Z_InitRequest *initRequest,
                       Z_InitResponse *initResponse)
@@ -220,7 +229,9 @@ IYaz_PDU_Observer *MyServer::sessionNotify(
     new_server->timeout(900);
     new_server->facility_add(&new_server->m_retrieval, "my sr");
     new_server->facility_add(&new_server->m_ill, "my ill");
+#if HAVE_YAZ_URSULA_H
     new_server->facility_add(&new_server->m_ursula, "my ill");
+#endif
 
     new_server->set_APDU_log(get_APDU_log());