X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=033aea12b6602d76718c97882449fdc91b660c2e;hb=49dfd3f8ec91ce7ced774d66f5db9a248e574bbf;hp=94c772e07b60e979da2b3515150a55f2694d5f32;hpb=7d212bcdc9d80ed8cc48e6dd72cb63855c936259;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 94c772e..033aea1 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: client.c,v 1.273 2005-02-02 17:11:05 adam Exp $ + * $Id: client.c,v 1.275 2005-03-06 12:54:32 adam Exp $ */ #include @@ -771,8 +771,6 @@ static void print_record(const unsigned char *buf, size_t len) /* add newline if not already added ... */ if (i <= 0 || buf[i-1] != '\n') printf ("\n"); - if (marc_file) - fwrite (buf, 1, len, marc_file); } static void display_record(Z_External *r) @@ -828,8 +826,12 @@ static void display_record(Z_External *r) } } if (ent && ent->value == VAL_SOIF) + { print_record((const unsigned char *) r->u.octet_aligned->buf, r->u.octet_aligned->len); + if (marc_file) + fwrite (r->u.octet_aligned->buf, 1, r->u.octet_aligned->len, marc_file); + } else if (r->which == Z_External_octet) { const char *octet_buf = (char*)r->u.octet_aligned->buf; @@ -947,6 +949,8 @@ static void display_record(Z_External *r) return; } print_record(r->u.sutrs->buf, r->u.sutrs->len); + if (marc_file) + fwrite (r->u.sutrs->buf, 1, r->u.sutrs->len, marc_file); } else if (ent && ent->value == VAL_GRS1) { @@ -961,8 +965,7 @@ static void display_record(Z_External *r) puts (wrbuf_buf(w)); wrbuf_free(w, 1); } - else if ( /* OPAC display not complete yet .. */ - ent && ent->value == VAL_OPAC) + else if (ent && ent->value == VAL_OPAC) { int i; if (r->u.opac->bibliographicRecord) @@ -2082,7 +2085,7 @@ static int cmd_update_common(const char *arg, int version) FILE *inf; struct stat status; stat (fname, &status); - if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r"))) + if (S_ISREG(status.st_mode) && (inf = fopen(fname, "rb"))) { size_t len = status.st_size; char *buf = (char *) xmalloc (len);