X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zlint%2Ftest-search-01.cpp;h=2144691611e4f2be3e94d5a46f0aae113b6a66d8;hb=09840dc91369b6db098188a74ce1d9988ede400b;hp=f537bc316efee5531eeb3e5dd7be3026687a3621;hpb=7411ed6df7fc0b535f83503f73d70e80f390e295;p=yazpp-moved-to-github.git

diff --git a/zlint/test-search-01.cpp b/zlint/test-search-01.cpp
index f537bc3..2144691 100644
--- a/zlint/test-search-01.cpp
+++ b/zlint/test-search-01.cpp
@@ -1,15 +1,17 @@
-/*
- * Copyright (c) 2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data 
  * See the file LICENSE for details.
- * 
- * $Id: test-search-01.cpp,v 1.5 2005-06-25 15:53:21 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>
 
 #include <zlint.h>
+#include <yaz/oid_db.h>
 
 static const char *try_query[] = {
     "@attr 1=4 petersson",
@@ -97,14 +99,14 @@ Zlint_code Zlint_test_search_01::sendTest(Zlint *z)
             sr->query->which = Z_Query_type_1;
             Z_RPNQuery *rpn;
             YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
-            
+
             z->getDatabase(&sr->databaseNames, &sr->num_databaseNames);
-            
+
             rpn = yaz_pqf_parse(pqf_parser, z->odr_encode(),
                                 try_query[m_query_no]);
-            
+
             yaz_pqf_destroy (pqf_parser);
-            
+
             if (!rpn)
             {
                 z->msg_check_fail("Query %s invalid", try_query[m_query_no]);
@@ -131,8 +133,9 @@ Zlint_code Zlint_test_search_01::sendTest(Zlint *z)
 
         z->msg_check_for("record syntax %s", try_syntax[m_record_syntax_no]);
         pr->preferredRecordSyntax =
-            yaz_str_to_z3950oid(z->odr_encode(), CLASS_RECSYN,
-                                try_syntax[m_record_syntax_no]);
+            yaz_string_to_oid_odr(yaz_oid_std(),
+                                  CLASS_RECSYN, try_syntax[m_record_syntax_no],
+                                  z->odr_encode());
         z->send_Z_PDU(apdu, &len);
         return TEST_CONTINUE;
     }
@@ -143,10 +146,10 @@ Zlint_code Zlint_test_search_01::sendTest(Zlint *z)
         {
             z->msg_check_for("sort %s", try_sort[m_sort_no]);
 
-            char *setstring = "default";
+            const char *setstring = "default";
             int len;
             Z_SortRequest *sr = apdu->u.sortRequest;
-            
+
             sr->num_inputResultSetNames = 1;
             sr->num_inputResultSetNames = 1;
             sr->inputResultSetNames = (Z_InternationalString **)
@@ -173,7 +176,6 @@ Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
         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 (!result)
         {
@@ -187,8 +189,8 @@ Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
              gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_searchResponse)
     {
         Z_SearchResponse *sr = gdu->u.z3950->u.searchResponse;
-        if (sr->records && (sr->records->which == Z_Records_NSD 
-                            || 
+        if (sr->records && (sr->records->which == Z_Records_NSD
+                            ||
                             sr->records->which == Z_Records_multipleNSD))
             m_query_no++;
         else if (!sr->resultCount || *sr->resultCount == 0)
@@ -202,12 +204,12 @@ Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
         }
         return sendTest(z);
     }
-    else if (gdu->which == Z_GDU_Z3950 && 
+    else if (gdu->which == Z_GDU_Z3950 &&
              gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_presentResponse)
     {
         Z_PresentResponse *sr = gdu->u.z3950->u.presentResponse;
-        if (sr->records && (sr->records->which == Z_Records_NSD 
-                            || 
+        if (sr->records && (sr->records->which == Z_Records_NSD
+                            ||
                             sr->records->which == Z_Records_multipleNSD))
         {
             z->msg_check_ok();
@@ -222,8 +224,9 @@ Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
             {
                 Z_External *ext = sr->records->u.databaseOrSurDiagnostics->records[0]->u.databaseRecord;
                 Odr_oid *expectRecordSyntax =
-                    yaz_str_to_z3950oid(z->odr_decode(), CLASS_RECSYN,
-                                        try_syntax[m_record_syntax_no]);
+                    yaz_string_to_oid_odr(
+                        yaz_oid_std(), CLASS_RECSYN,
+                        try_syntax[m_record_syntax_no], z->odr_decode());
                 if (oid_oidcmp(expectRecordSyntax,
                                ext->direct_reference))
                 {
@@ -254,7 +257,7 @@ Zlint_code Zlint_test_search_01::recv_gdu(Zlint *z, Z_GDU *gdu)
         m_record_syntax_no++;
         return sendTest(z);
     }
-    else if (gdu->which == Z_GDU_Z3950 && 
+    else if (gdu->which == Z_GDU_Z3950 &&
              gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_sortResponse)
     {
         Z_SortResponse *sr =  gdu->u.z3950->u.sortResponse;
@@ -278,6 +281,7 @@ Zlint_code Zlint_test_search_01::recv_fail(Zlint *z, int reason)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab