X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_read.c;h=91bea6ccf2cc4c3125e4cb8bb4c19763cc1622be;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=f19b20e0c290154ea16b2a319972bfff0ae6a932;hpb=eab4cdc5571ca8811ebaae09358b223b7debc02f;p=idzebra-moved-to-github.git

diff --git a/data1/d1_read.c b/data1/d1_read.c
index f19b20e..91bea6c 100644
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,6 +1,6 @@
-/* $Id: d1_read.c,v 1.12 2004-12-10 11:56:21 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: d1_read.c,v 1.17 2005-04-28 08:12:28 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -29,18 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <stdlib.h>
 
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>  
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <yaz/yaz-util.h>
 #include <d1_absyn.h>
 
 data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
@@ -708,8 +697,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 	{
 	    data1_xattr *xattr;
 
-	    char tag[64];
-	    char args[256];
+	    char tag[256];
 	    int null_tag = 0;
 	    int end_tag = 0;
 	    size_t i = 0;
@@ -720,6 +708,33 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		end_tag = 1;
 		c = ampr (get_byte, fh, &amp);
 	    }
+	    else if (amp == 0 && c == '?')
+	    {
+		int quote_mode = 0;
+		while ((c = ampr(get_byte, fh, &amp)))
+		{
+		    if (amp)
+			continue;
+		    if (quote_mode == 0)
+		    {
+			if (c == '"')
+			    quote_mode = c;
+			else if (c == '\'')
+			    quote_mode = c;
+			else if (c == '>')
+			{
+			    c = ampr(get_byte, fh, &amp);
+			    break;
+			}
+		    }
+		    else 
+		    {
+			if (amp == 0 && c == quote_mode)
+			    quote_mode = 0;
+		    }
+		}
+		continue;
+	    }
 	    else if (amp == 0 && c == '!')
 	    {
                 int c0, amp0;
@@ -787,7 +802,6 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 	    }
 	    tag[i] = '\0';
 	    xattr = data1_read_xattr (dh, m, get_byte, fh, wrbuf, &c, &amp);
-	    args[0] = '\0';
 	    if (amp == 0 && c == '/')
 	    {    /* <tag attrs/> or <tag/> */
 		null_tag = 1;
@@ -840,17 +854,20 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
                 }
 		continue;
 	    }	
-	    else if (!strcmp(tag, "var"))
+	    else if (!strcmp(tag, "var") 
+		     && xattr && xattr->next && xattr->next->next
+		     && xattr->value == 0 
+		     && xattr->next->value == 0
+		     && xattr->next->next->value == 0)
 	    {
-		char tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
+		/* <var class type value> */
+		const char *tclass = xattr->name;
+		const char *type = xattr->next->name;
+		const char *value = xattr->next->name;
 		data1_vartype *tp;
-		int val_offset;
 		
-		if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
-		{
-		    yaz_log(YLOG_WARN, "Malformed variant triple at '%s'", tag);
-		    continue;
-		}
+		yaz_log(YLOG_LOG, "Variant class=%s type=%s value=%s",
+			tclass, type, value);
 		if (!(tp =
 		      data1_getvartypebyct(dh,
 					   parent->root->u.root.absyn->varset,
@@ -880,7 +897,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		    res = data1_mk_node2 (dh, m, DATA1N_variant, parent);
 		    res->u.variant.type = tp;
 		    res->u.variant.value =
-			data1_insert_string (dh, res, m, args + val_offset);
+			data1_insert_string (dh, res, m, value);
 		}
 	    }
 	    else 
@@ -1119,12 +1136,15 @@ int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
     if (yaz_matchstr (tocode, fromcode))
     {
         WRBUF wrbuf = wrbuf_alloc();
-        yaz_iconv_t t = yaz_iconv_open (tocode, fromcode);
+        yaz_iconv_t t = yaz_iconv_open(tocode, fromcode);
         if (!t)
+	{
+            wrbuf_free(wrbuf, 1);
             return -1;
-        data1_iconv_s (dh, m, n, t, wrbuf, tocode);
-        yaz_iconv_close (t);
-        wrbuf_free (wrbuf, 1);
+	}
+        data1_iconv_s(dh, m, n, t, wrbuf, tocode);
+        yaz_iconv_close(t);
+        wrbuf_free(wrbuf, 1);
     }
     return 0;
 }