XML reader for data1 (EXPAT)

[yaz-moved-to-github.git] / zoom / zoom-c.c

diff --git a/zoom/zoom-c.c b/zoom/zoom-c.c
index 41ec33b..2136dab 100644 (file)
--- a/zoom/zoom-c.c
+++ b/zoom/zoom-c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoom-c.c,v 1.23 2002-01-28 09:27:48 adam Exp $
+ * $Id: zoom-c.c,v 1.26 2002-05-07 11:00:58 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -16,6 +16,8 @@
 #include <sys/poll.h>
 #endif
 
+static int ZOOM_connection_send_init (ZOOM_connection c);
+
 static ZOOM_Event ZOOM_Event_create (int kind)
 {
     ZOOM_Event event = (ZOOM_Event) xmalloc (sizeof(*event));
@@ -331,6 +333,9 @@ void ZOOM_connection_destroy(ZOOM_connection c)
     ZOOM_options_destroy (c->options);
     ZOOM_connection_remove_tasks (c);
     xfree (c->host_port);
+    xfree (c->proxy);
+    xfree (c->cookie_out);
+    xfree (c->cookie_in);
     xfree (c);
 }
 
@@ -519,7 +524,15 @@ static int do_connect (ZOOM_connection c)
     {
        int ret = cs_connect (c->cs, add);
        yaz_log (LOG_DEBUG, "cs_connect returned %d", ret);
-       if (ret >= 0)
+        if (ret == 0)
+        {
+            ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
+            ZOOM_connection_put_event(c, event);
+            ZOOM_connection_send_init(c);
+            c->state = STATE_ESTABLISHED;
+            return 1;
+        }
+        else if (ret > 0)
        {
            c->state = STATE_CONNECTING; 
             c->mask = ZOOM_SELECT_EXCEPT;
@@ -902,51 +915,96 @@ const char *ZOOM_record_get (ZOOM_record rec, const char *type, int *len)
        }
        return "none";
     }
-    else if (!strcmp (type, "render"))
+    else if (!strcmp (type, "render") && 
+             npr->which == Z_NamePlusRecord_databaseRecord)
     {
-       if (npr->which == Z_NamePlusRecord_databaseRecord)
-       {
-           Z_External *r = (Z_External *) npr->u.databaseRecord;
-           oident *ent = oid_getentbyoid(r->direct_reference);
-           
-           if (r->which == Z_External_sutrs)
-           {
-               *len = r->u.sutrs->len;
-               return (const char *) r->u.sutrs->buf;
-           }
-           else if (r->which == Z_External_octet)
-           {
-               switch (ent->value)
-               {
-               case VAL_SOIF:
-               case VAL_HTML:
-               case VAL_SUTRS:
-                   break;
-               case VAL_TEXT_XML:
-               case VAL_APPLICATION_XML:
-                   break;
-               default:
-                   if (!rec->wrbuf_marc)
-                       rec->wrbuf_marc = wrbuf_alloc();
-                    wrbuf_rewind (rec->wrbuf_marc);
-                   if (marc_display_wrbuf ((const char *)
-                                            r->u.octet_aligned->buf,
-                                            rec->wrbuf_marc, 0,
-                                           r->u.octet_aligned->len) > 0)
-                   {
-                       *len = wrbuf_len(rec->wrbuf_marc);
-                       return wrbuf_buf(rec->wrbuf_marc);
-                   }
-               }
-               *len = r->u.octet_aligned->len;
-               return (const char *) r->u.octet_aligned->buf;
-           }
-           else if (r->which == Z_External_grs1)
-           {
-               *len = 5;
-               return "GRS-1";
-           }
-       }
+        Z_External *r = (Z_External *) npr->u.databaseRecord;
+        oident *ent = oid_getentbyoid(r->direct_reference);
+        
+        if (r->which == Z_External_sutrs)
+        {
+            *len = r->u.sutrs->len;
+            return (const char *) r->u.sutrs->buf;
+        }
+        else if (r->which == Z_External_octet)
+        {
+            switch (ent->value)
+            {
+            case VAL_SOIF:
+            case VAL_HTML:
+            case VAL_SUTRS:
+                break;
+            case VAL_TEXT_XML:
+            case VAL_APPLICATION_XML:
+                break;
+            default:
+                if (!rec->wrbuf_marc)
+                    rec->wrbuf_marc = wrbuf_alloc();
+                wrbuf_rewind (rec->wrbuf_marc);
+                if (yaz_marc_decode ((const char *)
+                                     r->u.octet_aligned->buf,
+                                     rec->wrbuf_marc, 0,
+                                     r->u.octet_aligned->len,
+                                     0) > 0)
+                {
+                    *len = wrbuf_len(rec->wrbuf_marc);
+                    return wrbuf_buf(rec->wrbuf_marc);
+                }
+            }
+            *len = r->u.octet_aligned->len;
+            return (const char *) r->u.octet_aligned->buf;
+        }
+        else if (r->which == Z_External_grs1)
+        {
+            *len = 5;
+            return "GRS-1";
+        }
+       return 0;
+    }
+    else if (!strcmp (type, "xml") && 
+             npr->which == Z_NamePlusRecord_databaseRecord)
+    {
+        Z_External *r = (Z_External *) npr->u.databaseRecord;
+        oident *ent = oid_getentbyoid(r->direct_reference);
+        
+        if (r->which == Z_External_sutrs)
+        {
+            *len = r->u.sutrs->len;
+            return (const char *) r->u.sutrs->buf;
+        }
+        else if (r->which == Z_External_octet)
+        {
+            switch (ent->value)
+            {
+            case VAL_SOIF:
+            case VAL_HTML:
+            case VAL_SUTRS:
+                break;
+            case VAL_TEXT_XML:
+            case VAL_APPLICATION_XML:
+                break;
+            default:
+                if (!rec->wrbuf_marc)
+                    rec->wrbuf_marc = wrbuf_alloc();
+                wrbuf_rewind (rec->wrbuf_marc);
+                if (yaz_marc_decode ((const char *)
+                                     r->u.octet_aligned->buf,
+                                     rec->wrbuf_marc, 0,
+                                     r->u.octet_aligned->len,
+                                     1) > 0)
+                {
+                    *len = wrbuf_len(rec->wrbuf_marc);
+                    return wrbuf_buf(rec->wrbuf_marc);
+                }
+            }
+            *len = r->u.octet_aligned->len;
+            return (const char *) r->u.octet_aligned->buf;
+        }
+        else if (r->which == Z_External_grs1)
+        {
+            *len = 5;
+            return "GRS-1";
+        }
        return 0;
     }
     else if (!strcmp (type, "raw"))