X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_read.c;h=52e2364312f3ea71f08b99c78c4392172d3765a0;hp=4a96ec30eb4f5a3413397ff3eda4a065d9dd6ab7;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=cf22d9136ae778877b227aa9d47dc3856a6d9149

diff --git a/data1/d1_read.c b/data1/d1_read.c
index 4a96ec3..52e2364 100644
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,5 +1,5 @@
-/* $Id: d1_read.c,v 1.15 2005-01-17 22:12:34 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: d1_read.c,v 1.21 2006-08-14 10:40:06 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -125,7 +125,6 @@ data1_node *data1_append_node (data1_handle dh, NMEM m, int type,
 {
     data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = 0;
-    r->destroy = 0;
 
     r->parent = parent;
     if (!parent)
@@ -154,7 +153,6 @@ data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
 {
     data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = 0;
-    r->destroy = 0;
     
     if (!parent)
         r->root = r;
@@ -172,23 +170,9 @@ data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
     return r;
 }
 
-void data1_free_tree (data1_handle dh, data1_node *t)
-{
-    data1_node *p = t->child, *pn;
-
-    while (p)
-    {
-	pn = p->next;
-	data1_free_tree (dh, p);
-	p = pn;
-    }
-    if (t->destroy)
-	(*t->destroy)(t);
-}
-
 data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(dh, name, 1);
     data1_node *res;
     if (!absyn)
     {
@@ -205,7 +189,8 @@ data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 void data1_set_root(data1_handle dh, data1_node *res,
                     NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(
+        dh, name, DATA1_XPATH_INDEXING_ENABLE);
 
     res->u.root.type = data1_insert_string (dh, res, nmem, name);
     res->u.root.absyn = absyn;
@@ -697,8 +682,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;
@@ -709,6 +693,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;
@@ -776,7 +787,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;
@@ -829,17 +839,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,
@@ -869,7 +882,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 
@@ -1150,3 +1163,11 @@ void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
         data1_concat_text(dh, m, n->child);
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+