Check for USEMARCON version

[yazproxy-moved-to-github.git] / src / yaz-usemarcon.cpp

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index 2e64c71..72dd3dc 100644 (file)
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-usemarcon.cpp,v 1.2 2005-06-25 15:58:34 adam Exp $
-   Copyright (c) 1998-2004, Index Data.
-
-This file is part of the yaz-proxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2009 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,11 +12,11 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
+#include <yaz/log.h>
 #include "proxyp.h"
 
 Yaz_usemarcon::Yaz_usemarcon()
@@ -45,14 +43,18 @@ int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
     if (stage1 && *stage1)
     {
         char *converted;
+#if RULE_VERSION >= 314
+        size_t convlen;
+#else
         int convlen;
+#endif
         if (!m_stage1)
         {
-            m_stage1 = new CDetails();
+            m_stage1 = new Usemarcon();
         }
         m_stage1->SetIniFileName(stage1);
         m_stage1->SetMarcRecord((char*) input, input_len);
-        int res = m_stage1->Start();
+        int res = m_stage1->Convert();
         if (res == 0)
         {
             m_stage1->GetMarcRecord(converted, convlen);
@@ -60,23 +62,30 @@ int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
             {
                 if (!m_stage2)
                 {
-                    m_stage2 = new CDetails();
+                    m_stage2 = new Usemarcon();
                 }
                 m_stage2->SetIniFileName(stage2);
                 m_stage2->SetMarcRecord(converted, convlen);
-                res = m_stage2->Start();
+                res = m_stage2->Convert();
                 if (res == 0)
                 {
                     free(converted);
                     m_stage2->GetMarcRecord(converted, convlen);
                 }
                 else
+                {
+                    yaz_log(YLOG_LOG, "USEMARCON stage 2 error %d", res);
                     return 0;
+                }
             }
             *output = converted;
             *output_len = convlen;
             return 1;
         }
+        else
+        {
+            yaz_log(YLOG_LOG, "USEMARCON stage 1 error %d", res);
+        }
     }
 #endif
     return 0;
@@ -84,6 +93,7 @@ int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab