-/* $Id: d1_marc.c,v 1.14 2006-05-10 08:13:18 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: d1_marc.c,v 1.19 2007-06-27 22:17:20 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]);
}
-/*
- * Locate some data under this node. This routine should handle variants
- * prettily.
- */
-static char *get_data(data1_node *n, int *len, int chop)
+static void get_data2(data1_node *n, int *len, char *dst, size_t max)
{
- char *r;
+ *len = 0;
while (n)
{
if (n->which == DATA1N_data)
{
- int i;
- *len = n->u.data.len;
-
- if (chop)
+ if (dst && *len < max)
{
- for (i = 0; i<*len; i++)
- if (!d1_isspace(n->u.data.data[i]))
- break;
- while (*len && d1_isspace(n->u.data.data[*len - 1]))
- (*len)--;
- *len = *len - i;
- if (*len > 0)
- return n->u.data.data + i;
- }
- else
- if (*len > 0)
- return n->u.data.data;
+ size_t copy_len = max - *len;
+ if (copy_len > n->u.data.len)
+ copy_len = n->u.data.len;
+ memcpy(dst + *len, n->u.data.data, copy_len);
+ }
+ *len += n->u.data.len;
}
if (n->which == DATA1N_tag)
n = n->child;
else
break;
}
- r = "";
- *len = strlen(r);
- return r;
}
static void memint (char *p, int val, int len)
else if (!strcmp(field->u.tag.tag, "leader"))
{
int dlen = 0;
- char *dbuf = get_data(subf, &dlen, 0);
- if (dlen > 24)
- dlen = 24;
- if (dbuf && dlen > 0)
- memcpy (leader, dbuf, dlen);
+ get_data2(subf, &dlen, leader, 24);
continue;
}
else if (!strcmp(field->u.tag.tag, "controlfield"))
continue; /* we skip comments, cdata .. */
len += p->identifier_length;
}
- get_data(subf, &dlen, control_field ? 0 : 1);
+ get_data2(subf, &dlen, 0, 0);
len += dlen;
}
}
}
for (; subf; subf = subf->next)
{
- char *data;
-
if (!control_field)
{
const char *identifier = "a";
memcpy (op + data_p+1, identifier, p->identifier_length-1);
data_p += p->identifier_length;
}
- data = get_data(subf, &dlen, control_field ? 0 : 1);
- memcpy (op + data_p, data, dlen);
+ get_data2(subf, &dlen, op + data_p, 100000);
data_p += dlen;
}
op[data_p++] = ISO2709_FS;