Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/Doxyfile.in b/Doxyfile.in
index ce0301a..fd2eb23 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -244,12 +244,12 @@ EXTRACT_ALL            = YES
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
 
-EXTRACT_PRIVATE        = NO
+EXTRACT_PRIVATE        = YES
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
 
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
@@ -1058,7 +1058,8 @@ PREDEFINED             = "YAZ_BEGIN_CDECL=  " \
                          "YAZ_END_CDECL= " \
                          "YAZ_EXPORT= " \
                          "YAZ_HAVE_XML2=1 " \
-                         "YAZ_HAVE_XSLT=1 "
+                         "YAZ_HAVE_XSLT=1 " \
+                         "HAVE_GETADDRINFO=1 "
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/src/Makefile.am b/src/Makefile.am
index cc8c903..e72c1ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,7 @@ libyaz_la_SOURCES=version.c options.c log.c \
   record_conv.c retrieval.c elementset.c snprintf.c query-charset.c \
   copy_types.c match_glob.c poll.c daemon.c \
   iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
-  iconv_decode_marc8.c iconv_decode_iso5426.c sc.c
+  iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 

diff --git a/src/iconv-p.h b/src/iconv-p.h
index f99943b..e5e92e8 100644 (file)
--- a/src/iconv-p.h
+++ b/src/iconv-p.h
@@ -103,6 +103,8 @@ yaz_iconv_decoder_t yaz_advancegreek_decoder(const char *name,
                                              yaz_iconv_decoder_t d);
 yaz_iconv_decoder_t yaz_wchar_decoder(const char *fromcode,
                                      yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_danmarc_decoder(const char *fromcode,
+                                        yaz_iconv_decoder_t d);
 
 #endif
 /*

diff --git a/src/iconv_decode_danmarc.c b/src/iconv_decode_danmarc.c
new file mode 100644 (file)
index 0000000..3dc0f6e
--- /dev/null
+++ b/src/iconv_decode_danmarc.c
@@ -0,0 +1,132 @@
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
+/**
+ * \file
+ * \brief Danmarc2 character set decoding
+ *
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
+#include "iconv-p.h"
+
+struct decoder_data {
+    unsigned long x_back;
+};
+
+static unsigned long read_danmarc(yaz_iconv_t cd, 
+                                  yaz_iconv_decoder_t d,
+                                  unsigned char *inp,
+                                  size_t inbytesleft, size_t *no_read)
+{
+    struct decoder_data *data = (struct decoder_data *) d->data;
+    unsigned long x = inp[0];
+
+    if (data->x_back)
+    {
+        *no_read = 1;
+        x = data->x_back;
+        data->x_back = 0;
+        return x;
+    }
+
+    if (x == '@')
+    {
+        if (inbytesleft < 2)
+        {
+            yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL);
+            *no_read = 0;
+            return 0;
+        }
+        switch(inp[1])
+        {
+        case '@':
+        case '*':
+        case 0xa4: /* CURRENCY SIGN */
+            x = inp[1];
+            *no_read = 2;
+            break;
+        case 0xe5: /* LATIN SMALL LETTER A WITH RING ABOVE */
+            x = 'a';
+            data->x_back = 'a';
+            *no_read = 1;
+            break;
+        case 0xc5: /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+            x = 'A';
+            data->x_back = 'a';
+            *no_read = 1;
+            break;
+        default:
+            if (inbytesleft < 5)
+            {
+                yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL);
+                *no_read = 0;
+                return 0;
+            }
+            else
+            {
+                unsigned long v;
+                sscanf(inp+1, "%4lx", &v);
+                *no_read = 5;
+                x = v;
+            }
+        }
+    }
+    else
+        *no_read = 1;
+    return x;
+}
+
+
+static size_t init_danmarc(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                           unsigned char *inp,
+                           size_t inbytesleft, size_t *no_read)
+{
+    struct decoder_data *data = (struct decoder_data *) d->data;
+    data->x_back = 0;
+    return 0;
+}
+
+void destroy_danmarc(yaz_iconv_decoder_t d)
+{
+    struct decoder_data *data = (struct decoder_data *) d->data;
+    xfree(data);
+}
+
+yaz_iconv_decoder_t yaz_danmarc_decoder(const char *fromcode,
+                                        yaz_iconv_decoder_t d)
+    
+{
+    if (!yaz_matchstr(fromcode, "danmarc"))
+    {
+        struct decoder_data *data = (struct decoder_data *)
+            xmalloc(sizeof(*data));
+        d->data = data;
+        data->x_back = 0;
+        d->read_handle = read_danmarc;
+        d->init_handle = init_danmarc;
+        d->destroy_handle = destroy_danmarc;
+        return d;
+    }
+    return 0;
+}
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */

diff --git a/src/siconv.c b/src/siconv.c
index d7f066d..697afe8 100644 (file)
--- a/src/siconv.c
+++ b/src/siconv.c
@@ -92,6 +92,8 @@ static int prepare_decoders(yaz_iconv_t cd, const char *tocode)
         return 1;
     if (yaz_wchar_decoder(tocode, &cd->decoder))
         return 1;
+    if (yaz_danmarc_decoder(tocode, &cd->decoder))
+        return 1;
     return 0;
 }
 

diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index 98bdc2b..d3edb22 100644 (file)
--- a/src/tcpdchk.c
+++ b/src/tcpdchk.c
@@ -22,6 +22,15 @@
 #include <netinet/in.h>
 #endif
 
+#if HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#if HAVE_SYS_SOCKET_H
+/* freebsd wants this for AF_INET */
+#include <sys/socket.h>
+#endif
+
 #if HAVE_NETDB_H
 #include <netdb.h>
 #endif

diff --git a/src/tcpip.c b/src/tcpip.c
index add2d32..11b676c 100644 (file)
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -418,8 +418,27 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add,
     return 1;
 }
 
-
 #if HAVE_GETADDRINFO
+/** \brief Creates socket using particular address family (AF_)
+    \param ai getaddrinfo result
+    \param mask family mask
+    \returns socket or -1 if none could be created
+
+*/
+static int create_socket_family(struct addrinfo *ai, unsigned mask)
+{
+    for (; ai; ai = ai->ai_next)
+    {
+        if ((ai->ai_family & mask) == mask)
+        {
+            int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+            if (s != -1)
+                return s;
+        }
+    }
+    return -1;
+}
+
 void *tcpip_straddr(COMSTACK h, const char *str)
 {
     tcpip_state *sp = (tcpip_state *)h->cprivate;
@@ -434,14 +453,13 @@ void *tcpip_straddr(COMSTACK h, const char *str)
     sp->ai = tcpip_getaddrinfo(str, port);
     if (sp->ai && h->state == CS_ST_UNBND)
     {
-        int s = -1;
-        struct addrinfo *ai = sp->ai;
-        for (; ai; ai = ai->ai_next)
-        {
-            s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-            if (s != -1)
-                break;
-        }
+        /* The getaddrinfo call may return multiple addresses when passive
+           flags are used (AI_PASSIVE). This function picks the IPV6 if a
+           socket can be created for it. Otherwise IPV4 is used.
+           See also bug #2350 */
+        int s = create_socket_family(sp->ai, AF_INET6);
+        if (s == -1)
+            s = create_socket_family(sp->ai, AF_INET);
         if (s == -1)
             return 0;
         h->iofile = s;

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 20424d6..5bc649a 100644 (file)
--- a/test/tsticonv.c
+++ b/test/tsticonv.c
@@ -681,6 +681,27 @@ static void tst_utf8_codes(void)
     YAZ_CHECK(utf8_check(100000000));
 }
 
+static void tst_danmarc_to_latin1(void)
+{
+    yaz_iconv_t cd = yaz_iconv_open("iso-8859-1", "danmarc");
+
+    YAZ_CHECK(cd);
+    if (!cd)
+        return;
+
+    YAZ_CHECK(tst_convert(cd, "ax", "ax"));
+
+    YAZ_CHECK(tst_convert(cd, "a@@b", "a@b"));
+    YAZ_CHECK(tst_convert(cd, "a@@@@b", "a@@b"));
+    YAZ_CHECK(tst_convert(cd, "@000ab", "\nb"));
+
+    YAZ_CHECK(tst_convert(cd, "@\xe5", "aa"));
+    YAZ_CHECK(tst_convert(cd, "@\xc5.", "Aa."));
+    
+    yaz_iconv_close(cd);
+}
+
+
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
@@ -700,6 +721,8 @@ int main (int argc, char **argv)
     tst_utf8_to_marc8("marc8lossy");
     tst_utf8_to_marc8("marc8lossless");
 
+    tst_danmarc_to_latin1();
+
     tst_latin1_to_marc8();
 
     tst_marc8_to_ucs4b();

diff --git a/win/makefile b/win/makefile
index c096690..ee78c78 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -495,6 +495,7 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_decode_marc8.obj \
    $(OBJDIR)\iconv_encode_wchar.obj \
    $(OBJDIR)\iconv_decode_iso5426.obj \
+   $(OBJDIR)\iconv_decode_danmarc.obj \
    $(OBJDIR)\mutex.obj \
    $(OBJDIR)\sc.obj