projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year range.
[yazproxy-moved-to-github.git]
/
src
/
yaz-usemarcon.cpp
diff --git
a/src/yaz-usemarcon.cpp
b/src/yaz-usemarcon.cpp
index
2e64c71
..
a815f7b
100644
(file)
--- a/
src/yaz-usemarcon.cpp
+++ b/
src/yaz-usemarcon.cpp
@@
-1,7
+1,7
@@
-/* $Id: yaz-usemarcon.cpp,v 1.2 2005-06-25 15:58:34 adam Exp $
- Copyright (c) 1998-2004, Index Data.
+/* $Id: yaz-usemarcon.cpp,v 1.3 2006-03-30 10:31:37 adam Exp $
+ Copyright (c) 1998-2006, Index Data.
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
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
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
@@
-19,6
+19,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
+#include <yaz/log.h>
#include "proxyp.h"
Yaz_usemarcon::Yaz_usemarcon()
#include "proxyp.h"
Yaz_usemarcon::Yaz_usemarcon()
@@
-48,11
+49,11
@@
int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
int convlen;
if (!m_stage1)
{
int convlen;
if (!m_stage1)
{
- m_stage1 = new CDetails();
+ m_stage1 = new Usemarcon();
}
m_stage1->SetIniFileName(stage1);
m_stage1->SetMarcRecord((char*) input, input_len);
}
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);
if (res == 0)
{
m_stage1->GetMarcRecord(converted, convlen);
@@
-60,23
+61,30
@@
int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
{
if (!m_stage2)
{
{
if (!m_stage2)
{
- m_stage2 = new CDetails();
+ m_stage2 = new Usemarcon();
}
m_stage2->SetIniFileName(stage2);
m_stage2->SetMarcRecord(converted, convlen);
}
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
if (res == 0)
{
free(converted);
m_stage2->GetMarcRecord(converted, convlen);
}
else
+ {
+ yaz_log(YLOG_LOG, "USEMARCON stage 2 error %d", res);
return 0;
return 0;
+ }
}
*output = converted;
*output_len = convlen;
return 1;
}
}
*output = converted;
*output_len = convlen;
return 1;
}
+ else
+ {
+ yaz_log(YLOG_LOG, "USEMARCON stage 1 error %d", res);
+ }
}
#endif
return 0;
}
#endif
return 0;