DLL exports

[yazpp-moved-to-github.git] / zoom / zrec.cpp

diff --git a/zoom/zrec.cpp b/zoom/zrec.cpp
index 18e34be..8537718 100644 (file)
--- a/zoom/zrec.cpp
+++ b/zoom/zrec.cpp
@@ -1,9 +1,9 @@
-// $Header: /home/cvsroot/yaz++/zoom/zrec.cpp,v 1.1 2002-08-08 13:31:54 mike Exp $
+// $Header: /home/cvsroot/yaz++/zoom/zrec.cpp,v 1.4 2002-10-09 09:07:10 mike Exp $
 
 // Z39.50 Record class
 
-#include "zoom++.h"
-#include <string.h>            // for strcasecmp()
+#include "zoom.h"
+#include <yaz/yaz-util.h>      // for yaz_matchstr()
 
 
 namespace ZOOM {
@@ -23,7 +23,7 @@ namespace ZOOM {
        record *rec = new record(0, 0);
        if ((rec->r = ZOOM_record_clone(r)) == 0) {
            // Presumably an out-of-memory error
-           throw systemError();
+           throw systemException();
        }
 
        return rec;
@@ -39,19 +39,19 @@ namespace ZOOM {
        const char *syn = ZOOM_record_get(r, "syntax", 0);
 
        // These string constants are from yaz/util/oid.c
-       if (!strcasecmp(syn, "xml"))
+       if (!yaz_matchstr(syn, "xml"))
            return XML;
-       else if (!strcasecmp(syn, "GRS-1"))
+       else if (!yaz_matchstr(syn, "GRS-1"))
            return GRS1;
-       else if (!strcasecmp(syn, "SUTRS"))
+       else if (!yaz_matchstr(syn, "SUTRS"))
            return SUTRS;
-       else if (!strcasecmp(syn, "USmarc"))
+       else if (!yaz_matchstr(syn, "USmarc"))
            return USMARC;
-       else if (!strcasecmp(syn, "UKmarc"))
+       else if (!yaz_matchstr(syn, "UKmarc"))
            return UKMARC;
-       else if (!strcasecmp(syn, "XML") ||
-                !strcasecmp(syn, "text-XML") ||
-                !strcasecmp(syn, "application-XML"))
+       else if (!yaz_matchstr(syn, "XML") ||
+                !yaz_matchstr(syn, "text-XML") ||
+                !yaz_matchstr(syn, "application-XML"))
            return XML;
 
        return UNKNOWN;