projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated version. Data1 compatibility fix for nodetomarc
[yaz-moved-to-github.git]
/
retrieval
/
d1_marc.c
diff --git
a/retrieval/d1_marc.c
b/retrieval/d1_marc.c
index
75acbb9
..
e649b58
100644
(file)
--- a/
retrieval/d1_marc.c
+++ b/
retrieval/d1_marc.c
@@
-3,7
+3,7
@@
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: d1_marc.c,v 1.19 2002-05-28 21:09:44 adam Exp $
+ * $Id: d1_marc.c,v 1.22 2002-08-17 07:56:59 adam Exp $
*/
*/
@@
-144,6
+144,7
@@
data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
return res;
}
return res;
}
+
/*
* Locate some data under this node. This routine should handle variants
* prettily.
/*
* Locate some data under this node. This routine should handle variants
* prettily.
@@
-151,21
+152,30
@@
data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
static char *get_data(data1_node *n, int *len)
{
char *r;
static char *get_data(data1_node *n, int *len)
{
char *r;
+ data1_node *np = 0;
- while (n->which != DATA1N_data && n->child)
- n = n->child;
- if (n->which != DATA1N_data ||
- (n->u.data.what != DATA1I_text && n->u.data.what != DATA1I_num))
+ while (n)
{
{
- r = "[Structured/included data]";
- *len = strlen(r);
- return r;
+ if (n->which == DATA1N_data)
+ {
+ *len = n->u.data.len;
+ while (*len && d1_isspace(n->u.data.data[*len - 1]))
+ (*len)--;
+ if (*len != 0)
+ return n->u.data.data;
+ }
+ if (n->which == DATA1N_tag)
+ np = n->child;
+ n = n->next;
+ if (!n)
+ {
+ n = np;
+ np = 0;
+ }
}
}
-
- *len = n->u.data.len;
- while (*len && d1_isspace(n->u.data.data[*len - 1]))
- (*len)--;
- return n->u.data.data;
+ r = "";
+ *len = strlen(r);
+ return r;
}
static void memint (char *p, int val, int len)
}
static void memint (char *p, int val, int len)
@@
-194,8
+204,9
@@
static int is_indicator (data1_marctab *p, data1_node *subf)
return 0;
}
return 0;
}
-static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
- char **buf, int *size)
+static int nodetomarc(data1_handle dh,
+ data1_marctab *p, data1_node *n, int selected,
+ char **buf, int *size)
{
int len = 26;
int dlen;
{
int len = 26;
int dlen;
@@
-205,6
+216,7
@@
static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
data1_node *field, *subf;
yaz_log (LOG_DEBUG, "nodetomarc");
data1_node *field, *subf;
yaz_log (LOG_DEBUG, "nodetomarc");
+
for (field = n->child; field; field = field->next)
{
int is00X = 0;
for (field = n->child; field; field = field->next)
{
int is00X = 0;
@@
-224,6
+236,12
@@
static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
if (subf->which == DATA1N_data)
is00X = 1;
if (subf->which == DATA1N_data)
is00X = 1;
+ if (!data1_is_xmlmode(dh))
+ {
+ if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+ is00X = 1;
+ }
+
if (!is00X)
len += p->indicator_length;
if (!is00X)
len += p->indicator_length;
@@
-274,6
+292,11
@@
static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
if (subf->which == DATA1N_data)
is00X = 1;
if (subf->which == DATA1N_data)
is00X = 1;
+ if (!data1_is_xmlmode(dh))
+ {
+ if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+ is00X = 1;
+ }
if (is_indicator (p, subf))
{
if (is_indicator (p, subf))
{
@@
-327,6
+350,9
@@
char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n,
int *size;
char **buf = data1_get_map_buf (dh, &size);
int *size;
char **buf = data1_get_map_buf (dh, &size);
- *len = nodetomarc(p, n, selected, buf, size);
+ n = data1_get_root_tag (dh, n);
+ if (!n)
+ return 0;
+ *len = nodetomarc(dh, p, n, selected, buf, size);
return *buf;
}
return *buf;
}