X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_backend_test.cpp;h=020e823aad52e3e55de162d532c68aaab2aa3d7a;hb=a715926f3a2dc33f605b119561ccac38322f1c7b;hp=635d9eb8c174274e7fecf56a15dd21537c05e9e8;hpb=219ffa015c0e35b03fae0788b0e8e6abcfde1a81;p=metaproxy-moved-to-github.git diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp index 635d9eb..020e823 100644 --- a/src/filter_backend_test.cpp +++ b/src/filter_backend_test.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_backend_test.cpp,v 1.24 2007-04-13 09:57:51 adam Exp $ +/* $Id: filter_backend_test.cpp,v 1.25 2007-04-16 21:54:52 adam Exp $ Copyright (c) 2005-2007, Index Data. See the LICENSE file for details @@ -100,14 +100,14 @@ Z_Records *yf::BackendTest::Rep::fetch( return 0; } - const char *name_oid = OID_STR_USMARC; // default if syntax is given + if (!preferredRecordSyntax) + preferredRecordSyntax = odr_oiddup(odr, yaz_oid_recsyn_usmarc); + if (preferredRecordSyntax) { - name_oid = - yaz_oid_to_string(yaz_oid_std(), preferredRecordSyntax, 0); - if (name_oid && !strcmp(name_oid, OID_STR_USMARC)) + if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) ; - else if (name_oid && !strcmp(name_oid, OID_STR_XML)) + else if (!oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) ; else { @@ -128,13 +128,13 @@ Z_Records *yf::BackendTest::Rep::fetch( element_set_name = esn->u.generic; } if (!strcmp(element_set_name, "B") - && !strcmp(name_oid, OID_STR_USMARC)) + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) ; // Brief else if (!strcmp(element_set_name, "F") - && !strcmp(name_oid, OID_STR_USMARC)) + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_usmarc)) ; // Full else if (!strncmp(element_set_name, "FF", 2) - && !strcmp(name_oid, OID_STR_XML)) + && !oid_oidcmp(preferredRecordSyntax, yaz_oid_recsyn_xml)) ; // Huge XML test record else {