X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=2660283d3cb9268d4a8cfa59c8769266a6a4c5b2;hb=263fe1daee74b19f379ed1a68222d09ef4c2752d;hp=d292079ddc93742939ebfa38302b7cb1c5fc45aa;hpb=4fbad84813bfafe3c0c8e368d252a192cd84b3f3;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index d292079..2660283 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -3,20 +3,15 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: d1_read.c,v 1.50 2002-08-26 10:43:52 adam Exp $
+ * $Id: d1_read.c,v 1.52 2002-09-24 07:58:59 adam Exp $
  */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <errno.h>
-
-#if HAVE_ICONV_H
-#include <iconv.h>
-#endif
-
 #include <yaz/xmalloc.h>
+#include <yaz/yaz-util.h>
 #include <yaz/log.h>
 #include <yaz/data1.h>
 
@@ -170,13 +165,22 @@ void data1_set_root(data1_handle dh, data1_node *res,
 }
 
 data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
-                                 const char *target, const char **attr,
-                                 data1_node *at)
+                                 const char *target,
+                                 const char **attr, data1_node *at)
+{
+    return data1_mk_preprocess_n (dh, nmem, target, strlen(target),
+                                  attr, at);
+}
+
+data1_node *data1_mk_preprocess_n (data1_handle dh, NMEM nmem,
+                                   const char *target, size_t len,
+                                   const char **attr, data1_node *at)
 {
     data1_xattr **p;
     data1_node *res = data1_mk_node2 (dh, nmem, DATA1N_preprocess, at);
-    res->u.preprocess.target = data1_insert_string (dh, res, nmem, target);
-
+    res->u.preprocess.target = data1_insert_string_n (dh, res, nmem,
+                                                      target, len);
+    
     p = &res->u.preprocess.attributes;
     while (attr && *attr)
     {
@@ -331,7 +335,7 @@ char *data1_insert_string_n (data1_handle dh, data1_node *res,
 {
     char *b;
     if (len >= DATA1_LOCALDATA)
-        b = nmem_malloc (m, len+1);
+        b = (char *) nmem_malloc (m, len+1);
     else
         b = res->lbuf;
     memcpy (b, str, len);
@@ -634,13 +638,63 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		c = ampr (get_byte, fh, &amp);
 	    }
 	    else if (amp == 0 && c == '!')
-                /* tags/comments that we don't deal with yet */
 	    {
-		while (amp || (c && c != '>'))
-		    c = ampr (get_byte, fh, &amp);
-		if (c)
-		    c = ampr (get_byte, fh, &amp);
-		continue;
+                int c0, amp0;
+              
+                wrbuf_rewind(wrbuf);
+                
+                c0 = ampr (get_byte, fh, &amp0);
+                if (amp0 == 0 && c0 == '\0')
+                    break;
+                c = ampr (get_byte, fh, &amp);
+                
+                if (amp0 == 0 && c0 == '-' && amp == 0 && c == '-')
+                {
+                    /* COMMENT: <!-- ... --> */
+                    int no_dash = 0;
+                    
+                    c = ampr (get_byte, fh, &amp);
+                    while (amp || c)
+                    {
+                        if (amp == 0 && c == '-')
+                            no_dash++;
+                        else if (amp == 0 && c == '>' && no_dash >= 2)
+                        {
+                            if (level > 0)
+                                d1_stack[level] = 
+                                    data1_mk_comment_n (
+                                        dh, m,
+                                        wrbuf_buf(wrbuf), wrbuf_len(wrbuf)-2,
+                                        d1_stack[level-1]);
+                            c = ampr (get_byte, fh, &amp); /* skip > */
+                            break;
+                        }
+                        else
+                            no_dash = 0;
+                        wrbuf_putc (wrbuf, c);
+                        c = ampr (get_byte, fh, &amp);
+                    }
+                    continue;
+                }
+                else
+                {   /* DIRECTIVE: <! .. > */
+	
+		    int blevel = 0;
+                    while (amp || c)
+                    {
+                        if (amp == 0 && c == '>' && blevel == 0)
+                        {
+                            c = ampr (get_byte, fh, &amp);
+			    break;
+                        }
+			if (amp == 0 && c == '[')
+			    blevel++;
+			if (amp == 0 && c == ']' && blevel > 0)
+			    blevel--;
+                        c = ampr (get_byte, fh, &amp);
+                    }
+                    continue;
+                }
 	    }
 	    while (amp || (c && c != '>' && c != '/' && !d1_isspace(c)))
 	    {
@@ -871,9 +925,7 @@ data1_node *data1_read_sgml (data1_handle dh, NMEM m, const char *buf)
 }
 
 
-#if HAVE_ICONV_H
-
-static int conv_item (NMEM m, iconv_t t, 
+static int conv_item (NMEM m, yaz_iconv_t t, 
                       WRBUF wrbuf, char *inbuf, size_t inlen)
 {
     wrbuf_rewind (wrbuf);
@@ -883,8 +935,8 @@ static int conv_item (NMEM m, iconv_t t,
     {
         char *outbuf = wrbuf->buf + wrbuf->pos;
         size_t outlen = wrbuf->size - wrbuf->pos;
-        if (iconv (t, &inbuf, &inlen, &outbuf, &outlen) ==
-            (size_t)(-1) && errno != E2BIG)
+        if (yaz_iconv (t, &inbuf, &inlen, &outbuf, &outlen) ==
+            (size_t)(-1) && yaz_iconv_error(t) != YAZ_ICONV_E2BIG)
         {
             /* bad data. stop and skip conversion entirely */
             return -1;
@@ -905,7 +957,7 @@ static int conv_item (NMEM m, iconv_t t,
 }
 
 static void data1_iconv_s (data1_handle dh, NMEM m, data1_node *n,
-                           iconv_t t, WRBUF wrbuf, const char *tocode)
+                           yaz_iconv_t t, WRBUF wrbuf, const char *tocode)
 {
     for (; n; n = n->next)
     {
@@ -957,7 +1009,6 @@ static void data1_iconv_s (data1_handle dh, NMEM m, data1_node *n,
         data1_iconv_s (dh, m, n->child, t, wrbuf, tocode);
     }
 }
-#endif
 
 const char *data1_get_encoding (data1_handle dh, data1_node *n)
 {
@@ -982,19 +1033,15 @@ int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
                   const char *tocode, 
                   const char *fromcode)
 {
-#if HAVE_ICONV_H
     if (strcmp (tocode, fromcode))
     {
         WRBUF wrbuf = wrbuf_alloc();
-        iconv_t t = iconv_open (tocode, fromcode);
-        if (t == (iconv_t) (-1))
+        yaz_iconv_t t = yaz_iconv_open (tocode, fromcode);
+        if (!t)
             return -1;
         data1_iconv_s (dh, m, n, t, wrbuf, tocode);
-        iconv_close (t);
+        yaz_iconv_close (t);
         wrbuf_free (wrbuf, 1);
     }
     return 0;
-#else
-    return -2;
-#endif
 }