record_transform: new step usemarcon

For calling USEMARCON to convert record(s).

diff --git a/configure.ac b/configure.ac
index 5cb6340..1c28777 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,8 @@ AC_CHECK_LIB([m],[main])
 
 AC_CHECK_FUNCS([localtime_r])
 
+USEMARCON_INIT
+
 ## YAZPP checks
 YAZPP_INIT([threads],[1.2.7])
 if test -z "$YAZPPLIB"; then

diff --git a/etc/retrieval-info.xml b/etc/retrieval-info.xml
index bcbac21..cf7132f 100644 (file)
--- a/etc/retrieval-info.xml
+++ b/etc/retrieval-info.xml
@@ -24,4 +24,9 @@
       <xslt stylesheet="../xml/xslt/MARC21slim2DC.xsl"/>
     </backend>
   </retrieval>
+  <retrieval syntax="unimarc" name="F">
+    <backend syntax="usmarc" name="F">
+      <usemarcon stage1="/etc/usemarcon/uni2us/uni2us.ini"/>
+    </backend>
+  </retrieval>
 </retrievalinfo>

diff --git a/m4 b/m4
index 381df5c..a63e9ca 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 381df5cae0710a79464c9a02878c745a1a7e2388
+Subproject commit a63e9ca4bf4ca6e78f16d58196e7b962de95a6f1

diff --git a/src/Makefile.am b/src/Makefile.am
index 27b58dc..fb3fc31 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ DISTCLEANFILES = metaproxy-config
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(USEMARCONINC)
 
 AM_LDFLAGS =
 
@@ -62,7 +62,8 @@ libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_
 
 # Rules for lib
 
-LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
+LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) \
+       $(BOOST_REGEX_LIB) $(USEMARCONLALIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl

diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp
index d3709bc..f6ddac0 100644 (file)
--- a/src/filter_record_transform.cpp
+++ b/src/filter_record_transform.cpp
@@ -26,6 +26,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/zgdu.h>
 #include <yaz/retrieval.h>
 
+#if HAVE_USEMARCON
+#include <usemarconlib.h>
+#include <defines.h>
+#endif
+
 #include <iostream>
 
 namespace mp = metaproxy_1;
@@ -46,6 +51,118 @@ namespace metaproxy_1 {
     }
 }
 
+#if HAVE_USEMARCON
+struct info_usemarcon {
+    char *stage1;
+    char *stage2;
+
+    Usemarcon *usemarcon1;
+    Usemarcon *usemarcon2;
+};
+
+static int convert_usemarcon(void *info, WRBUF record, WRBUF wr_error)
+{
+    struct info_usemarcon *p = (struct info_usemarcon *) info;
+
+    if (p->usemarcon1)
+    {
+        char *converted;
+        size_t convlen;
+        int res;
+
+        p->usemarcon1->SetMarcRecord(wrbuf_buf(record), wrbuf_len(record));
+        res = p->usemarcon1->Convert();
+        if (res != 0)
+        {
+            wrbuf_printf(wr_error, "usemarcon stage1 failed res=%d", res);
+            return -1;
+        }
+        p->usemarcon1->GetMarcRecord(converted, convlen);
+        
+        if (p->usemarcon2)
+        {
+            p->usemarcon2->SetMarcRecord(converted, convlen);
+            
+            res = p->usemarcon2->Convert();
+            free(converted);
+            if (res != 0)
+            {
+                wrbuf_printf(wr_error, "usemarcon stage2 failed res=%d",
+                             res);
+                return -1;
+            }
+            p->usemarcon2->GetMarcRecord(converted, convlen);
+        }
+        wrbuf_rewind(record);
+        wrbuf_write(record, converted, convlen);
+        free(converted);
+    }
+    return 0;
+}
+
+static void destroy_usemarcon(void *info)
+{
+    struct info_usemarcon *p = (struct info_usemarcon *) info;
+
+    delete p->usemarcon1;
+    delete p->usemarcon2;
+    xfree(p->stage1);
+    xfree(p->stage2);
+    xfree(p);
+}
+
+static void *construct_usemarcon(const xmlNode *ptr, const char *path,
+                                 WRBUF wr_error)
+{
+    struct _xmlAttr *attr;
+    if (strcmp((const char *) ptr->name, "usemarcon"))
+        return 0;
+
+    struct info_usemarcon *p = (struct info_usemarcon *) xmalloc(sizeof(*p));
+    p->stage1 = 0;
+    p->stage2 = 0;
+    p->usemarcon1 = 0;
+    p->usemarcon2 = 0;
+
+    for (attr = ptr->properties; attr; attr = attr->next)
+    {
+        if (!xmlStrcmp(attr->name, BAD_CAST "stage1") &&
+            attr->children && attr->children->type == XML_TEXT_NODE)
+            p->stage1 = xstrdup((const char *) attr->children->content);
+        else if (!xmlStrcmp(attr->name, BAD_CAST "stage2") &&
+            attr->children && attr->children->type == XML_TEXT_NODE)
+            p->stage2 = xstrdup((const char *) attr->children->content);
+        else
+        {
+            wrbuf_printf(wr_error, "Bad attribute '%s'"
+                         "Expected stage1 or stage2.", attr->name);
+            destroy_usemarcon(p);
+            return 0;
+        }
+    }
+
+    if (p->stage1)
+    {
+        p->usemarcon1 = new Usemarcon();
+        p->usemarcon1->SetIniFileName(p->stage1);
+    }
+    if (p->stage2)
+    {
+        p->usemarcon2 = new Usemarcon();
+        p->usemarcon2->SetIniFileName(p->stage2);
+    }
+    return p;
+}
+
+static void type_usemarcon(struct yaz_record_conv_type *t)
+{
+    t->next = 0;
+    t->construct = construct_usemarcon;
+    t->convert = convert_usemarcon;
+    t->destroy = destroy_usemarcon;
+}
+#endif
+
 // define Pimpl wrapper forwarding to Impl
  
 yf::RecordTransform::RecordTransform() : m_p(new Impl)
@@ -100,8 +217,16 @@ void yf::RecordTransform::Impl::configure(const xmlNode *xml_node,
             break;
     }
 
+#if HAVE_USEMARCON
+    struct yaz_record_conv_type mt;
+    type_usemarcon(&mt);
+    struct yaz_record_conv_type *t = &mt;
+#else
+    struct yaz_record_conv_type *t = 0;
+#endif
+
     // read configuration
-    if (0 != yaz_retrieval_configure(m_retrieval, retrieval_node))
+    if (0 != yaz_retrieval_configure_t(m_retrieval, retrieval_node, t))
     {
         std::string msg("RecordTransform filter config: ");
         msg += yaz_retrieval_get_error(m_retrieval);

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 9d731af..a20b220 100644 (file)
--- a/xml/schema/retrievalinfo.rnc
+++ b/xml/schema/retrievalinfo.rnc
@@ -36,6 +36,11 @@ xslt = element y:xslt {
   attribute stylesheet { xsd:string }
 }
 
+usemarcon = element y:usemarcon {
+  attribute stage1 { xsd:string }?,
+  attribute stage2 { xsd:string }?
+}
+
 retrievalinfo = 
   element y:retrievalinfo { 
     attribute version { "1.0" },
@@ -48,7 +53,7 @@ retrievalinfo =
       element y:backend {
       attribute syntax { xsd:string },
       attribute name { xsd:string }?,
-      (marc | xslt)*
+      (marc | xslt | usemarcon)*
       }?
     }+
   }