Added ZiNG Update Support. New codecs are defined in srw.h. Extended the

[yaz-moved-to-github.git] / src / srwutil.c

diff --git a/src/srwutil.c b/src/srwutil.c
index b2fc44d..27840ce 100644 (file)
--- a/src/srwutil.c
+++ b/src/srwutil.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: srwutil.c,v 1.29 2005-08-22 20:34:21 adam Exp $
+ * $Id: srwutil.c,v 1.32 2005-11-08 15:08:03 adam Exp $
  */
 /**
  * \file srwutil.c
@@ -29,17 +29,18 @@ int yaz_uri_array(const char *path, ODR o, char ***name, char ***val)
     int no = 2;
     const char *cp;
     *name = 0;
-    if (*path != '?')
+    if (*path == '?')
+        path++;
+    if (!*path)
         return no;
-    path++;
     cp = path;
     while ((cp = strchr(cp, '&')))
     {
         cp++;
         no++;
     }
-    *name = odr_malloc(o, no * sizeof(char**));
-    *val = odr_malloc(o, no * sizeof(char**));
+    *name = odr_malloc(o, no * sizeof(char*));
+    *val = odr_malloc(o, no * sizeof(char*));
 
     for (no = 0; *path; no++)
     {
@@ -177,12 +178,14 @@ int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
             int ret = -1;
             const char *charset_p = 0;
             
-            static Z_SOAP_Handler soap_handlers[3] = {
+            static Z_SOAP_Handler soap_handlers[4] = {
 #if HAVE_XML2
                 {"http://www.loc.gov/zing/srw/", 0,
                  (Z_SOAP_fun) yaz_srw_codec},
                 {"http://www.loc.gov/zing/srw/v1.0/", 0,
                  (Z_SOAP_fun) yaz_srw_codec},
+                {"http://www.loc.gov/zing/srw/update/", 0,
+                 (Z_SOAP_fun) yaz_ucp_codec},
 #endif
                 {0, 0, 0}
             };
@@ -229,6 +232,10 @@ int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
                     (*srw_pdu)->u.scan_request->database == 0)
                     (*srw_pdu)->u.scan_request->database = db;
 
+                if ((*srw_pdu)->which == Z_SRW_update_request &&
+                    (*srw_pdu)->u.update_request->database == 0)
+                    (*srw_pdu)->u.update_request->database = db;
+
                 return 0;
             }
             return 1;
@@ -251,8 +258,21 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
         {0, 0, 0}
     };
 #endif
-    if (!strcmp(hreq->method, "GET") ||
-      !strcmp(hreq->method, "POST") )
+    const char *content_type = z_HTTP_header_lookup(hreq->headers,
+                                                    "Content-Type");
+    /*
+      SRU GET: allow any content type.
+      SRU POST: we support "application/x-www-form-urlencoded";
+      not  "multipart/form-data" .
+    */
+    if (!strcmp(hreq->method, "GET") 
+        ||
+        (!strcmp(hreq->method, "POST") 
+         && content_type &&
+         !yaz_strcmp_del("application/x-www-form-urlencoded",
+                         content_type, "; ")
+            )
+        )
     {
         char *db = "Default";
         const char *p0 = hreq->path, *p1;
@@ -512,6 +532,20 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
     return 2;
 }
 
+Z_SRW_extra_record *yaz_srw_get_extra_record(ODR o)
+{
+    Z_SRW_extra_record *res = (Z_SRW_extra_record *)
+        odr_malloc(o, sizeof(*res));
+    res->type = 1;
+    res->recordReviewCode = 0;
+    res->recordReviewNote = 0;
+    res->recordId = 0;
+    res->nonDupRecordId = 0;
+    res->recordLockStatus = 0;
+    res->recordOldVersion = 0;
+    return res;
+}
+
 Z_SRW_PDU *yaz_srw_get(ODR o, int which)
 {
     Z_SRW_PDU *sr = (Z_SRW_PDU *) odr_malloc(o, sizeof(*o));
@@ -547,6 +581,7 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which)
         sr->u.response->diagnostics = 0;
         sr->u.response->num_diagnostics = 0;
         sr->u.response->nextRecordPosition = 0;
+        sr->u.response->extra_records = 0;
         break;
     case Z_SRW_explain_request:
         sr->u.explain_request = (Z_SRW_explainRequest *)
@@ -566,6 +601,7 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which)
             Z_SRW_recordPacking_string;
         sr->u.explain_response->diagnostics = 0;
         sr->u.explain_response->num_diagnostics = 0;
+        sr->u.explain_response->extra_record = 0;
         break;
     case Z_SRW_scan_request:
         sr->u.scan_request = (Z_SRW_scanRequest *)
@@ -580,16 +616,46 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which)
     case Z_SRW_scan_response:
         sr->u.scan_response = (Z_SRW_scanResponse *)
             odr_malloc(o, sizeof(*sr->u.scan_response));
-        sr->u.scan_response->terms = 0;
-        sr->u.scan_response->num_terms = 0;
-        sr->u.scan_response->diagnostics = 0;
-        sr->u.scan_response->num_diagnostics = 0;
+       sr->u.scan_response->terms = 0;
+       sr->u.scan_response->num_terms = 0;
+       sr->u.scan_response->diagnostics = 0;
+       sr->u.scan_response->num_diagnostics = 0;
+    case Z_SRW_update_request:
+        sr->u.update_request = (Z_SRW_updateRequest *)
+            odr_malloc(o, sizeof(*sr->u.update_request));
+       sr->u.update_request->database = 0;
+       sr->u.update_request->stylesheet = 0;
+        sr->u.update_request->record.recordSchema = 0;
+        sr->u.update_request->record.recordPacking = Z_SRW_recordPacking_XML;
+       sr->u.update_request->recordId = 0;
+       sr->u.update_request->recordVersion = 0;
+       sr->u.update_request->recordOldVersion = 0;
+        sr->u.update_request->record.recordData_buf = 0;
+        sr->u.update_request->record.recordData_len = 0;
+        sr->u.update_request->extra_record = 0;
+        sr->u.update_request->extraRequestData = 0;
+       sr->u.request->database = 0;
+        break;
+    case Z_SRW_update_response:
+        sr->u.update_response = (Z_SRW_updateResponse *)
+            odr_malloc(o, sizeof(*sr->u.update_response));
+       sr->u.update_response->operationStatus = 0;
+       sr->u.update_response->recordId = 0;
+       sr->u.update_response->recordVersion = 0;
+       sr->u.update_response->recordChecksum = 0;
+       sr->u.update_response->record.recordData_buf = 0;
+       sr->u.update_response->record.recordData_len = 0;
+       sr->u.update_response->record.recordSchema = 0;
+       sr->u.update_response->record.recordPacking =
+           Z_SRW_recordPacking_XML;
+        sr->u.update_response->extra_record = 0;
+        sr->u.update_response->extraResponseData = 0;
+       sr->u.update_response->diagnostics = 0;
+       sr->u.update_response->num_diagnostics = 0;
     }
     return sr;
 }
 
-
-
 /* bib1:srw */
 static int srw_bib1_map[] = {
     1, 1,