X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fiso5428.c;h=8d7b3c28f55b8b505805fed417acef61032c7a54;hp=a78b00d3287186cc62a436d79c104e28775ded14;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=cccb7ecd623450d5b3ca2391327788c84aed71c8

diff --git a/src/iso5428.c b/src/iso5428.c
index a78b00d..8d7b3c2 100644
--- a/src/iso5428.c
+++ b/src/iso5428.c
@@ -1,12 +1,10 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: siconv.c,v 1.50 2008-03-12 08:53:28 adam Exp $
  */
 /**
  * \file
- * \brief ISO-5428 character mapping (iconv)
+ * \brief ISO-5428:1984 encoding and decoding
  */
 
 #if HAVE_CONFIG_H
@@ -16,12 +14,12 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "iconv-p.h"
 
-unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
-                                    size_t inbytesleft, size_t *no_read)
+static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                                        unsigned char *inp,
+                                        size_t inbytesleft, size_t *no_read)
 {
     unsigned long x = 0;
     int tonos = 0;
@@ -43,7 +41,7 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
         inp++;
         --inbytesleft;
         (*no_read)++;
-    }    
+    }
     if (inbytesleft == 0)
     {
         yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL); /* incomplete input */
@@ -52,15 +50,15 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
     }
     switch (*inp) {
     case 0xe1: /*  alpha small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ac;
-            else 
+            else
                 x = 0x03b1;
             break;
     case 0xc1: /*  alpha capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0386;
-            else 
+            else
                 x = 0x0391;
             break;
 
@@ -85,15 +83,15 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x0394;
             break;
     case 0xe6: /*  epsilon small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ad;
-            else 
+            else
                 x = 0x03b5;
             break;
     case 0xc6: /*  epsilon capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0388;
-            else 
+            else
                 x = 0x0395;
             break;
     case 0xe9: /*  Zeta small */
@@ -103,15 +101,15 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x0396;
             break;
     case 0xea: /*  Eta small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ae;
-            else 
+            else
                 x = 0x03b7;
             break;
     case 0xca: /*  Eta capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0389;
-            else 
+            else
                 x = 0x0397;
             break;
     case 0xeb: /*  Theta small */
@@ -121,24 +119,24 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x0398;
             break;
     case 0xec: /*  Iota small */
-            if (tonos) 
-                if (dialitika) 
+            if (tonos)
+                if (dialitika)
                     x = 0x0390;
-                else 
+                else
                     x = 0x03af;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03ca;
-                else 
+                else
                     x = 0x03b9;
             break;
     case 0xcc: /*  Iota capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038a;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03aa;
-                else 
+                else
                     x = 0x0399;
             break;
     case 0xed: /*  Kappa small */
@@ -172,15 +170,15 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x039e;
             break;
     case 0xf2: /*  Omicron small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03cc;
-            else 
+            else
                 x = 0x03bf;
             break;
     case 0xd2: /*  Omicron capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038c;
-            else 
+            else
                 x = 0x039f;
             break;
     case 0xf3: /*  Pi small */
@@ -211,24 +209,24 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x03a4;
             break;
     case 0xf9: /*  Upsilon small */
-            if (tonos) 
-                if (dialitika) 
+            if (tonos)
+                if (dialitika)
                     x = 0x03b0;
-                else 
+                else
                     x = 0x03cd;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03cb;
-                else 
+                else
                     x = 0x03c5;
             break;
     case 0xd9: /*  Upsilon capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038e;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03ab;
-                else 
+                else
                     x = 0x03a5;
             break;
     case 0xfa: /*  Phi small */
@@ -250,15 +248,15 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
             x = 0x03a8;
             break;
     case 0xfd: /*  Omega small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ce;
-            else 
+            else
                 x = 0x03c9;
             break;
     case 0xdd: /*  Omega capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038f;
-            else 
+            else
                 x = 0x03a9;
             break;
     default:
@@ -266,12 +264,13 @@ unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
         break;
     }
     (*no_read)++;
-    
+
     return x;
 }
 
-size_t yaz_write_iso5428_1984(yaz_iconv_t cd, unsigned long x,
-                              char **outbuf, size_t *outbytesleft)
+static size_t write_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_encoder_t en,
+                                 unsigned long x,
+                                 char **outbuf, size_t *outbytesleft)
 {
     size_t k = 0;
     unsigned char *out = (unsigned char*) *outbuf;
@@ -357,7 +356,7 @@ size_t yaz_write_iso5428_1984(yaz_iconv_t cd, unsigned long x,
             yaz_iconv_set_errno(cd, YAZ_ICONV_EILSEQ);
             return (size_t) -1;
         }
-        out[k++] = x;
+        out[k++] = (unsigned char ) x;
         break;
     }
     *outbytesleft -= k;
@@ -365,11 +364,38 @@ size_t yaz_write_iso5428_1984(yaz_iconv_t cd, unsigned long x,
     return 0;
 }
 
+yaz_iconv_encoder_t yaz_iso_5428_encoder(const char *name,
+                                         yaz_iconv_encoder_t e)
+{
+    if (!yaz_matchstr(name, "iso54281984")
+        || !yaz_matchstr(name, "iso5428:1984"))
+    {
+        e->write_handle = write_iso_5428_1984;
+        return e;
+    }
+    return 0;
+}
+
+yaz_iconv_decoder_t yaz_iso_5428_decoder(const char *name,
+                                         yaz_iconv_decoder_t d)
+{
+    if (!yaz_matchstr(name, "iso54281984")
+        || !yaz_matchstr(name, "iso5428:1984"))
+    {
+        d->read_handle = read_iso_5428_1984;
+        return d;
+    }
+    return 0;
+}
+
+
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+