From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 30 May 2007 08:22:03 +0000 (+0000)
Subject: Charset ISO5428:1984 is an alias for ISO5428-1984.
X-Git-Tag: YAZ.3.0.10~77
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=b56e2d9e43985fa33d1d7ee8d0c9b1ed69eba8d3;p=yaz-moved-to-github.git

Charset ISO5428:1984 is an alias for ISO5428-1984.
---

diff --git a/NEWS b/NEWS
index aec80d1..ce8607f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Charset ISO5428:1984 is an alias for ISO5428-1984.
+
 Implemented a way to perform scan in a result set using Z39.50. This
 is achieved by attaching the result set name in the characterInfo
 (type InternationalString) of OtherInformation in the Scan Request PDU.
diff --git a/src/siconv.c b/src/siconv.c
index 1420e78..d2b78be 100644
--- a/src/siconv.c
+++ b/src/siconv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: siconv.c,v 1.41 2007-05-23 08:50:11 adam Exp $
+ * $Id: siconv.c,v 1.42 2007-05-30 08:22:03 adam Exp $
  */
 /**
  * \file siconv.c
@@ -1718,6 +1718,8 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode)
             cd->read_handle = yaz_read_advancegreek;
         else if (!yaz_matchstr(fromcode, "iso54281984"))
             cd->read_handle = yaz_read_iso5428_1984;
+        else if (!yaz_matchstr(fromcode, "iso5428:1984"))
+            cd->read_handle = yaz_read_iso5428_1984;
 #if HAVE_WCHAR_H
         else if (!yaz_matchstr(fromcode, "WCHAR_T"))
             cd->read_handle = yaz_read_wchar_t;
@@ -1752,6 +1754,10 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode)
         {
             cd->write_handle = yaz_write_iso5428_1984;
         }
+        else if (!yaz_matchstr(tocode, "iso5428:1984"))
+        {
+            cd->write_handle = yaz_write_iso5428_1984;
+        }
 #if HAVE_WCHAR_H
         else if (!yaz_matchstr(tocode, "WCHAR_T"))
             cd->write_handle = yaz_write_wchar_t;