X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zlint%2Ftest-scan-01.cpp;h=e01650b9b710ff901e64eb9517c2aae111536ad2;hb=10bef8a44467b3fbd7e023cd995a9607941dddec;hp=119d9bbc42731657264c9ce029b7dffb29ff8153;hpb=40213edfa0408f88b008c3d1ee4a4f90dcdf2fb9;p=yazpp-moved-to-github.git

diff --git a/zlint/test-scan-01.cpp b/zlint/test-scan-01.cpp
index 119d9bb..e01650b 100644
--- a/zlint/test-scan-01.cpp
+++ b/zlint/test-scan-01.cpp
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2008 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: test-scan-01.cpp,v 1.1 2004-03-25 23:14:07 adam Exp $
  */
 
 #include <yaz/log.h>
@@ -40,8 +38,8 @@ Zlint_code Zlint_test_scan_01::init(Zlint *z)
     int r = z->send_Z_PDU(apdu, &len);
     if (r < 0)
     {
-	z->msg_check_fail("unable to send init request");
-	return TEST_FINISHED;
+        z->msg_check_fail("unable to send init request");
+        return TEST_FINISHED;
     }
     return TEST_CONTINUE;
 }
@@ -50,76 +48,76 @@ Zlint_code Zlint_test_scan_01::sendTest(Zlint *z)
 {
     if (try_scan[m_scan_no])
     {
-	int len;
-	z->msg_check_for("scan support %s", try_scan[m_scan_no]);
+        int len;
+        z->msg_check_for("scan support %s", try_scan[m_scan_no]);
 
-	Z_APDU *apdu = zget_APDU(z->odr_encode(), Z_APDU_scanRequest);
-	YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
-	Z_ScanRequest *sr = apdu->u.scanRequest;
-	sr->termListAndStartPoint = yaz_pqf_scan(pqf_parser,
-						 z->odr_encode(),
-						 &sr->attributeSet,
-						 try_scan[m_scan_no]);
-	
-	z->getDatabase(&sr->databaseNames, &sr->num_databaseNames);
-	
-	yaz_pqf_destroy (pqf_parser);
-	z->send_Z_PDU(apdu, &len);
-	return TEST_CONTINUE;
+        Z_APDU *apdu = zget_APDU(z->odr_encode(), Z_APDU_scanRequest);
+        YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
+        Z_ScanRequest *sr = apdu->u.scanRequest;
+        sr->termListAndStartPoint = yaz_pqf_scan(pqf_parser,
+                                                 z->odr_encode(),
+                                                 &sr->attributeSet,
+                                                 try_scan[m_scan_no]);
+        
+        z->getDatabase(&sr->databaseNames, &sr->num_databaseNames);
+        
+        yaz_pqf_destroy (pqf_parser);
+        z->send_Z_PDU(apdu, &len);
+        return TEST_CONTINUE;
     }
     else
-	return TEST_FINISHED;
+        return TEST_FINISHED;
 }
 
 Zlint_code Zlint_test_scan_01::recv_gdu(Zlint *z, Z_GDU *gdu)
 {
     if (gdu->which == Z_GDU_Z3950 &&
-	gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse)
+        gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse)
     {
-	Z_InitResponse *init = gdu->u.z3950->u.initResponse;
-	int ver = z->initResponseGetVersion(init);
-	int result = init->result ? *init->result : 0;
-	if (ver > 3 || ver < 2)
-	    z->msg_check_fail("got version %d, expected 2 or 3", ver);
-	if (!result)
-	{
-	    z->msg_check_fail("init rejected (result false)");
-	    return TEST_FINISHED;
-	}
-	else if (!ODR_MASK_GET(init->options, Z_Options_scan))
-	{
-	    z->msg_check_notapp();
-	    z->msg_check_info("scan unsupported");
-	    return TEST_FINISHED;
-	}
-	else
-	{
-	    sendTest(z);
-	    return TEST_CONTINUE;
-	}
+        Z_InitResponse *init = gdu->u.z3950->u.initResponse;
+        int ver = z->initResponseGetVersion(init);
+        int result = init->result ? *init->result : 0;
+        if (ver > 3 || ver < 2)
+            z->msg_check_fail("got version %d, expected 2 or 3", ver);
+        if (!result)
+        {
+            z->msg_check_fail("init rejected (result false)");
+            return TEST_FINISHED;
+        }
+        else if (!ODR_MASK_GET(init->options, Z_Options_scan))
+        {
+            z->msg_check_notapp();
+            z->msg_check_info("scan unsupported");
+            return TEST_FINISHED;
+        }
+        else
+        {
+            sendTest(z);
+            return TEST_CONTINUE;
+        }
     }
     else if (gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_scanResponse)
     {
-	Z_ScanResponse *sr =  gdu->u.z3950->u.scanResponse;
-	if (sr->entries->nonsurrogateDiagnostics)
-	{
-	    z->msg_check_ok();
-	    z->msg_check_info("scan NSD for %s", try_scan[m_scan_no]);
-	}
-	else if (sr->entries->entries && sr->entries->num_entries > 0)
-	{
-	    z->msg_check_ok();
-	}
-	else
-	{
-	    z->msg_check_fail("scan no entries/diagnostics for %s",
-			      try_scan[m_scan_no]);
-	}
-	m_scan_no++;
-	return sendTest(z);
+        Z_ScanResponse *sr =  gdu->u.z3950->u.scanResponse;
+        if (sr->entries->nonsurrogateDiagnostics)
+        {
+            z->msg_check_ok();
+            z->msg_check_info("scan NSD for %s", try_scan[m_scan_no]);
+        }
+        else if (sr->entries->entries && sr->entries->num_entries > 0)
+        {
+            z->msg_check_ok();
+        }
+        else
+        {
+            z->msg_check_fail("scan no entries/diagnostics for %s",
+                              try_scan[m_scan_no]);
+        }
+        m_scan_no++;
+        return sendTest(z);
     }
     else
-	z->msg_check_fail("did not receive init response as expected");
+        z->msg_check_fail("did not receive init response as expected");
     return TEST_FINISHED;
 }
 
@@ -129,3 +127,11 @@ Zlint_code Zlint_test_scan_01::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
+ */
+