-/* $Id: d1_marc.c,v 1.12 2005-02-02 19:37:27 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: d1_marc.c,v 1.18 2007-04-16 08:44:31 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. 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
+
*/
/* converts data1 tree to ISO2709/MARC record */
#include <string.h>
#include <yaz/log.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <yaz/marcdisp.h>
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
int argc;
if (!(f = data1_path_fopen(dh, file, "r")))
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
- }
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->next = 0;
res->length_data_entry = 4;
res->length_starting = 5;
*argv);
continue;
}
- if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_TAGSET, argv[1],
+ mem);
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown tagset reference '%s'",
file, lineno, argv[1]);
for (; subf; subf = subf->next)
{
if (!control_field)
+ {
+ if (marc_xml && subf->which != DATA1N_tag)
+ continue; /* we skip comments, cdata .. */
len += p->identifier_length;
+ }
get_data(subf, &dlen, control_field ? 0 : 1);
len += dlen;
}
const char *identifier = "a";
if (marc_xml)
{
- if (subf->which == DATA1N_tag &&
- !strcmp(subf->u.tag.tag, "subfield"))
- {
- data1_xattr *xa;
- for (xa = subf->u.tag.attributes; xa; xa = xa->next)
- if (!strcmp(xa->name, "code"))
- identifier = xa->value;
- }
+ data1_xattr *xa;
+ if (subf->which != DATA1N_tag)
+ continue;
+ if (strcmp(subf->u.tag.tag, "subfield"))
+ yaz_log(YLOG_WARN, "Unhandled tag %s",
+ subf->u.tag.tag);
+
+ for (xa = subf->u.tag.attributes; xa; xa = xa->next)
+ if (!strcmp(xa->name, "code"))
+ identifier = xa->value;
}
else if (subf->which != DATA1N_tag)
yaz_log(YLOG_WARN, "Malformed fields for marc output.");
*len = nodetomarc(dh, p, n, selected, buf, size);
return *buf;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+