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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
src
/
iconv_decode_marc8.c
diff --git
a/src/iconv_decode_marc8.c
b/src/iconv_decode_marc8.c
index
84af5b3
..
7b31510
100644
(file)
--- a/
src/iconv_decode_marc8.c
+++ b/
src/iconv_decode_marc8.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-259,7
+259,7
@@
void destroy_marc8(yaz_iconv_decoder_t d)
yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
yaz_iconv_decoder_t d)
{
yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
yaz_iconv_decoder_t d)
{
- if (!yaz_matchstr(fromcode, "MARC8"))
+ if (!yaz_matchstr(fromcode, "MARC8") || !yaz_matchstr(fromcode, "ANSEL"))
d->read_handle = read_marc8;
else if (!yaz_matchstr(fromcode, "MARC8s"))
d->read_handle = read_marc8s;
d->read_handle = read_marc8;
else if (!yaz_matchstr(fromcode, "MARC8s"))
d->read_handle = read_marc8s;
@@
-279,7
+279,9
@@
yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+