GFS: scan handler gets extra_args from request

[yaz-moved-to-github.git] / src / odr_oct.c

diff --git a/src/odr_oct.c b/src/odr_oct.c
index 27cd9b0..f359c4c 100644 (file)
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,15 +1,15 @@
-/*
- * Copyright (c) 1995-2003, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: odr_oct.c,v 1.2 2004-08-11 12:15:38 adam Exp $
+ */
+/**
+ * \file odr_oct.c
+ * \brief Implements ODR OCTET codec
  */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <yaz/log.h>
 #include "odr-priv.h"
 
 /*
@@ -21,42 +21,36 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     int res, cons = 0;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
+        return 0;
     if (!res)
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-        int i;
-       odr_prname(o, name);
-       odr_printf(o, "OCTETSTRING(len=%d)", (*p)->len);
-        for (i = 0; i<(*p)->len; i++)
-        {
-           if (i < 5 || i > ((*p)->len - 4))
-            {
-                odr_printf(o, " %02X", (*p)->buf[i]);
-            }
-            else if (i == 5)
-                odr_printf(o, " .. ");
-        }
+        odr_prname(o, name);
+        odr_printf(o, "OCTETSTRING(len=%d) ", (*p)->len);
+
+        o->op->stream_write(o, o->op->print, ODR_OCTETSTRING,
+                            (char*) (*p)->buf, (*p)->len);
         odr_printf(o, "\n");
-       return 1;
+        return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-       *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
-       (*p)->size= 0;
-       (*p)->len = 0;
-       (*p)->buf = 0;
+        *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
+        (*p)->size= 0;
+        (*p)->len = 0;
+        (*p)->buf = 0;
     }
     if (ber_octetstring(o, *p, cons))
-       return 1;
+        return 1;
     odr_seterror(o, OOTHER, 43);
     return 0;
 }
@@ -70,40 +64,41 @@ int odr_cstring(ODR o, char **p, int opt, const char *name)
     Odr_oct *t;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
+        return 0;
     if (!res)
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       odr_printf(o, "'%s'\n", *p);
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "'%s'\n", *p);
+        return 1;
     }
     t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
-       t->buf = (unsigned char *) *p;
-       t->size = t->len = strlen(*p);
+        t->buf = (unsigned char *) *p;
+        t->size = t->len = strlen(*p);
     }
     else
     {
-       t->size= 0;
-       t->len = 0;
-       t->buf = 0;
+        t->size= 0;
+        t->len = 0;
+        t->buf = 0;
     }
     if (!ber_octetstring(o, t, cons))
-       return 0;
+        return 0;
     if (o->direction == ODR_DECODE)
     {
-       *p = (char *) t->buf;
-       *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
+        *p = (char *) t->buf;
+        *(*p + t->len) = '\0';  /* ber_octs reserves space for this */
     }
     return 1;
 }
@@ -117,21 +112,22 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     Odr_oct *t;
 
     if (o->error)
-       return 0;
-    if (o->t_class < 0)
+        return 0;
+    if (o->op->t_class < 0)
     {
-       o->t_class = ODR_UNIVERSAL;
-       o->t_tag = ODR_OCTETSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OCTETSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
-       return 0;
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
+        return 0;
     if (!res)
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       odr_prname(o, name);
-       odr_printf(o, "'%s'\n", *p);
-       return 1;
+        odr_prname(o, name);
+        odr_printf(o, "'%s'\n", *p);
+        return 1;
     }
     t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
@@ -145,11 +141,19 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t outleft = 4 * inleft + 2;
             char *outbuf = (char *) odr_malloc (o, outleft);
             size_t ret;
-            
+
             t->buf = (unsigned char *) outbuf;
-            
-            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
-                             &outbuf, &outleft);
+
+            ret = yaz_iconv(o->op->iconv_handle, &inbuf, &inleft,
+                            &outbuf, &outleft);
+            if (ret == (size_t)(-1))
+            {
+                odr_seterror(o, ODATA, 44);
+                return 0;
+            }
+            ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+                            &outbuf, &outleft);
+
             if (ret == (size_t)(-1))
             {
                 odr_seterror(o, ODATA, 44);
@@ -165,12 +169,12 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     }
     else
     {
-       t->size= 0;
-       t->len = 0;
-       t->buf = 0;
+        t->size= 0;
+        t->len = 0;
+        t->buf = 0;
     }
     if (!ber_octetstring(o, t, cons))
-       return 0;
+        return 0;
     if (o->direction == ODR_DECODE)
     {
         *p = 0;
@@ -184,7 +188,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t ret;
 
             *p = outbuf;
-            
+
             ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
                              &outbuf, &outleft);
             if (ret == (size_t)(-1))
@@ -192,8 +196,15 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
                 odr_seterror(o, ODATA, 45);
                 return 0;
             }
+            ret = yaz_iconv(o->op->iconv_handle, 0, 0,
+                            &outbuf, &outleft);
+            if (ret == (size_t)(-1))
+            {
+                odr_seterror(o, ODATA, 45);
+                return 0;
+            }
             inleft = outbuf - (char*) *p;
-            
+
             (*p)[inleft] = '\0';    /* null terminate it */
         }
         if (!*p)
@@ -204,3 +215,12 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     }
     return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+