X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zlint%2Fzlint.cpp;h=7a89a52dec1582863b3b376da7d834a7eb4cf674;hb=e432b52c33a684e9f90627b971d14da6b362daff;hp=6d68af2e7f50c28f491a645ca462ebff65d3f392;hpb=eb15a0d2234ee4020a738cf7730091b3475ff793;p=yazpp-moved-to-github.git

diff --git a/zlint/zlint.cpp b/zlint/zlint.cpp
index 6d68af2..7a89a52 100644
--- a/zlint/zlint.cpp
+++ b/zlint/zlint.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: zlint.cpp,v 1.6 2004-09-06 07:50:51 adam Exp $
+ * $Id: zlint.cpp,v 1.12 2005-09-22 12:40:45 adam Exp $
  */
 
 #include <stdio.h>
@@ -16,6 +16,11 @@
 
 #include <zlint.h>
 
+Zlint_test::~Zlint_test()
+{
+
+}
+
 class Zlint_t {
 public:
     friend class Zlint;
@@ -29,8 +34,8 @@ private:
     int m_test_reported;
 };
 
-Zlint::Zlint(IYaz_PDU_Observable *the_PDU_Observable) : 
-    Yaz_Z_Assoc(the_PDU_Observable)
+Zlint::Zlint(IPDU_Observable *the_PDU_Observable) : 
+    Z_Assoc(the_PDU_Observable)
     
 {
     m_PDU_Observable = the_PDU_Observable;
@@ -44,9 +49,9 @@ Zlint::~Zlint()
 {
     while (m_tests)
     {
-	Zlint_t *t = m_tests;
-	m_tests = t->m_next;
-	delete t;
+        Zlint_t *t = m_tests;
+        m_tests = t->m_next;
+        delete t;
     }
     xfree(m_host);
     xfree(m_database);
@@ -62,7 +67,7 @@ void Zlint::set_host(const char *cp)
     const char *basep;
     cs_get_host_args(m_host, &basep);
     if (!basep || !*basep)
-	basep = "Default";
+        basep = "Default";
     xfree(m_database);
     m_database = xstrdup(basep);
 }
@@ -71,13 +76,13 @@ void Zlint::timeoutNotify()
 {
     if (m_cur_test)
     {
-	if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
-	{
-	    close();
-	    client(m_host);
-	    timeout(30);
-	    return;
-	}
+        if (m_cur_test->m_t->recv_fail(this, 2) != TEST_FINISHED)
+        {
+            close();
+            client(m_host);
+            timeout(30);
+            return;
+        }
     }
     close_goto_next();
 }
@@ -86,13 +91,13 @@ void Zlint::failNotify()
 {
     if (m_cur_test)
     {
-	if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
-	{
-	    close();
-	    client(m_host);
-	    timeout(30);
-	    return;
-	}
+        if (m_cur_test->m_t->recv_fail(this, 1) != TEST_FINISHED)
+        {
+            close();
+            client(m_host);
+            timeout(30);
+            return;
+        }
     }
     close_goto_next();
 }
@@ -101,8 +106,8 @@ void Zlint::connectNotify()
 {
     if (m_cur_test)
     {
-	if (m_cur_test->m_t->init(this) != TEST_FINISHED)
-	    return;
+        if (m_cur_test->m_t->init(this) != TEST_FINISHED)
+            return;
     }
     close_goto_next();
 }
@@ -111,16 +116,16 @@ void Zlint::recv_GDU(Z_GDU *gdu, int len)
 {
     if (m_cur_test)
     {
-	int r = m_cur_test->m_t->recv_gdu(this, gdu);
-	if (r == TEST_CONTINUE)
-	    return;
-	if (r == TEST_REOPEN)
-	{
-	    close();
-	    client(m_host);
-	    timeout(30);
-	    return;
-	}
+        int r = m_cur_test->m_t->recv_gdu(this, gdu);
+        if (r == TEST_CONTINUE)
+            return;
+        if (r == TEST_REOPEN)
+        {
+            close();
+            client(m_host);
+            timeout(30);
+            return;
+        }
     }
     close_goto_next();
 }
@@ -129,14 +134,14 @@ void Zlint::close_goto_next()
 {
     close();
     if (m_cur_test)
-	m_cur_test = m_cur_test->m_next;
+        m_cur_test = m_cur_test->m_next;
     if (m_cur_test)
-	client(m_host);
+        client(m_host);
     timeout(30);
 }
 
-IYaz_PDU_Observer *Zlint::sessionNotify(
-    IYaz_PDU_Observable *the_PDU_Observable, int fd)
+IPDU_Observer *Zlint::sessionNotify(
+    IPDU_Observable *the_PDU_Observable, int fd)
 {
     return 0;
 }
@@ -144,7 +149,7 @@ IYaz_PDU_Observer *Zlint::sessionNotify(
 Z_ReferenceId *Zlint::mk_refid(const char *buf, int len)
 {
     Z_ReferenceId *id = 
-	(Z_ReferenceId *) odr_malloc(odr_encode(), sizeof(*id));
+        (Z_ReferenceId *) odr_malloc(odr_encode(), sizeof(*id));
     id->size = id->len = len;
     id->buf = (unsigned char*) odr_malloc(odr_encode(), len);
     memcpy(id->buf, buf, len);
@@ -157,14 +162,12 @@ int Zlint::initResponseGetVersion(Z_InitResponse *init)
     int off = 0;
     int i;
     for (i = 0; i<12; i++)
-	if (ODR_MASK_GET(init->protocolVersion, no))
-	{
-	    no = i+1;
-	    if (off)
-		yaz_log(LOG_WARN, "%sbad formatted version");
-	}
-	else
-	    off = 1;
+        if (ODR_MASK_GET(init->protocolVersion, no))
+        {
+            no = i+1;
+        }
+        else
+            off = 1;
     return no;
 }
 
@@ -172,10 +175,10 @@ void Zlint::add_test(Zlint_test *t)
 {
     Zlint_t **d = &m_tests;
     while (*d)
-	d = &(*d)->m_next;
+        d = &(*d)->m_next;
     *d = new Zlint_t(t);
     if (!m_cur_test)
-	m_cur_test = m_tests;
+        m_cur_test = m_tests;
 }
 
 void Zlint::msg_check_for(const char *fmt, ...)
@@ -206,9 +209,9 @@ void Zlint::msg_check_ok()
 {
     if (!m_cur_test->m_test_reported)
     {
-	m_cur_test->m_test_ok = 1;
-	m_cur_test->m_test_reported = 1;
-	printf ("OK\n");
+        m_cur_test->m_test_ok = 1;
+        m_cur_test->m_test_reported = 1;
+        printf ("OK\n");
     }
 }
 
@@ -216,9 +219,9 @@ void Zlint::msg_check_fail(const char *fmt, ...)
 {
     if (!m_cur_test->m_test_reported)
     {
-	m_cur_test->m_test_ok = 0;
-	m_cur_test->m_test_reported = 1;
-	printf ("Fail\n");
+        m_cur_test->m_test_ok = 0;
+        m_cur_test->m_test_reported = 1;
+        printf ("Fail\n");
     }
     va_list ap;
     va_start(ap, fmt);
@@ -232,9 +235,9 @@ void Zlint::msg_check_notapp()
 {
     if (!m_cur_test->m_test_reported)
     {
-	m_cur_test->m_test_ok = 2;
-	m_cur_test->m_test_reported = 1;
-	printf ("Unsupported\n");
+        m_cur_test->m_test_ok = 2;
+        m_cur_test->m_test_reported = 1;
+        printf ("Unsupported\n");
     }
 }
 
@@ -265,3 +268,11 @@ Zlint_code Zlint_test_simple::recv_fail(Zlint *z, int reason)
     z->msg_check_fail("target closed connection");
     return TEST_FINISHED;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+