Added data1_chop_text which removes whitespace in cdata nodes

diff --git a/data1/d1_read.c b/data1/d1_read.c
index fe95dd0..30e9732 100644 (file)
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,4 +1,4 @@
-/* $Id: d1_read.c,v 1.26 2007-05-21 11:53:49 adam Exp $
+/* $Id: d1_read.c,v 1.27 2007-06-27 22:04:45 adam Exp $

    Copyright (C) 1995-2007
    Index Data ApS
 
    Copyright (C) 1995-2007
    Index Data ApS
 

@@ -1105,6 +1105,35 @@ int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
     return 0;
 }
 
     return 0;
 }
 

+void data1_chop_text(data1_handle dh, NMEM m, data1_node *n)
+{
+    for (; n; n = n->next)
+    {
+        if (n->which == DATA1N_data)
+        {
+            
+            int sz = n->u.data.len;
+            const char *ndata = n->u.data.data;
+            int off = 0;
+            
+            for (off = 0; off < sz; off++)
+                if (!d1_isspace(ndata[off]))
+                    break;
+            sz = sz - off;
+            ndata += off;
+            
+            while (sz && d1_isspace(ndata[sz - 1]))
+                sz--;
+
+            n->u.data.data = nmem_malloc(m, sz);
+            n->u.data.len = sz;
+            memcpy(n->u.data.data, ndata, sz);
+               
+        }
+        data1_chop_text(dh, m, n->child);
+    }
+}
+

 void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
 {
     for (; n; n = n->next)
 void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
 {
     for (; n; n = n->next)

@@ -1134,6 +1163,7 @@ void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
         data1_concat_text(dh, m, n->child);
     }
 }
         data1_concat_text(dh, m, n->child);
     }
 }

+

 /*
  * Local variables:
  * c-basic-offset: 4
 /*
  * Local variables:
  * c-basic-offset: 4

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index dfd76c5..5d2ffdc 100644 (file)
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,4 +1,4 @@
-/* $Id: data1.h,v 1.23 2007-05-08 12:50:04 adam Exp $
+/* $Id: data1.h,v 1.24 2007-06-27 22:04:45 adam Exp $

    Copyright (C) 1995-2007
    Index Data ApS
 
    Copyright (C) 1995-2007
    Index Data ApS
 

@@ -578,6 +578,7 @@ YAZ_EXPORT const char *data1_systag_lookup(data1_absyn *absyn, const char *tag,
                                            const char *default_value);
 
 YAZ_EXPORT void data1_concat_text(data1_handle dh, NMEM m, data1_node *n);
                                            const char *default_value);
 
 YAZ_EXPORT void data1_concat_text(data1_handle dh, NMEM m, data1_node *n);

+YAZ_EXPORT void data1_chop_text(data1_handle dh, NMEM m, data1_node *n);

 
 YAZ_EXPORT void data1_absyn_destroy(data1_handle dh);
 
 
 YAZ_EXPORT void data1_absyn_destroy(data1_handle dh);