X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=414a475366211b1f3dc8e9b82dd0d1493f518af5;hb=60a702f390f7e2addfdab79f2328db3ba2897c8b;hp=10b9b69db13c420c413a5a5fc2f9c02e8b7597ec;hpb=6d50f66faab9c47d834c5433ae776ec6fc7df994;p=yaz-moved-to-github.git

diff --git a/src/srw.c b/src/srw.c
index 10b9b69..414a475 100644
--- a/src/srw.c
+++ b/src/srw.c
@@ -1,8 +1,12 @@
 /*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.25 2004-03-17 18:43:35 adam Exp $
+ * $Id: srw.c,v 1.34 2005-02-04 20:27:19 adam Exp $
+ */
+/**
+ * \file srw.c
+ * \brief Implements SRW/SRU package encoding and decoding
  */
 
 #include <yaz/srw.h>
@@ -91,7 +95,10 @@ static int match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
 #endif
     ptr = ptr->children;
     if (!ptr || ptr->type != XML_TEXT_NODE)
-        return 0;
+    {
+	*val = "";
+        return 1;
+    }
     *val = odr_strdup(o, ptr->content);
     if (len)
         *len = strlen(ptr->content);
@@ -243,7 +250,7 @@ static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
         }
         if (!*num)
             return 1;
-        *recs = odr_malloc(o, *num * sizeof(**recs));
+        *recs = (Z_SRW_record *) odr_malloc(o, *num * sizeof(**recs));
         for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
@@ -282,7 +289,7 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
         }
         if (!*num)
             return 1;
-        *recs = odr_malloc(o, *num * sizeof(**recs));
+        *recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
 	for (i = 0; i < *num; i++)
 	{
             (*recs)[i].uri = 0;
@@ -318,7 +325,7 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
     {
         int i;
 	xmlNsPtr ns_diag =
-	    xmlNewNs(pptr, "info:srw/schema/1/diagnostic-v1.1", 0);
+	    xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostic/", 0);
         for (i = 0; i < *num; i++)
         {
 	    const char *std_diag = "info:srw/diagnostic/1/";
@@ -349,6 +356,7 @@ static int yaz_srw_term(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm *term,
 	term->value = 0;
 	term->numberOfRecords = 0;
 	term->displayTerm = 0;
+	term->whereInList = 0;
 	for (ptr = pptr->children; ptr; ptr = ptr->next)
 	{
 	    if (match_xsd_string(ptr, "value", o,  &term->value))
@@ -359,14 +367,18 @@ static int yaz_srw_term(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm *term,
 	    else if (match_xsd_string(ptr, "displayTerm", o, 
 				      &term->displayTerm))
 		;
+	    else if (match_xsd_string(ptr, "whereInList", o, 
+				      &term->whereInList))
+		;
 	}
     }
     else if (o->direction == ODR_ENCODE)
     {
 	xmlNodePtr ptr = pptr;
 	add_xsd_string(ptr, "value", term->value);
-	add_xsd_integer(ptr, "value", term->numberOfRecords);
+	add_xsd_integer(ptr, "numberOfRecords", term->numberOfRecords);
 	add_xsd_string(ptr, "displayTerm", term->displayTerm);
+	add_xsd_string(ptr, "whereInList", term->whereInList);
     }
     return 0;
 }
@@ -387,7 +399,7 @@ static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms,
         }
         if (!*num)
             return 1;
-        *terms = odr_malloc(o, *num * sizeof(**terms));
+        *terms = (Z_SRW_scanTerm *) odr_malloc(o, *num * sizeof(**terms));
         for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
@@ -410,7 +422,7 @@ static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms,
 int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                   void *client_data, const char *ns)
 {
-    xmlNodePtr pptr = vptr;
+    xmlNodePtr pptr = (xmlNodePtr) vptr;
     if (o->direction == ODR_DECODE)
     {
 	Z_SRW_PDU **p = handler_data;
@@ -424,7 +436,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
         if (method->type != XML_ELEMENT_NODE)
             return -1;
 
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_SRW_PDU *) odr_malloc(o, sizeof(**p));
 	(*p)->srw_version = odr_strdup(o, "1.1");
 	
         if (!strcmp(method->name, "searchRetrieveRequest"))
@@ -433,7 +445,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             Z_SRW_searchRetrieveRequest *req;
 
             (*p)->which = Z_SRW_searchRetrieve_request;
-            req = (*p)->u.request = odr_malloc(o, sizeof(*req));
+            req = (*p)->u.request = (Z_SRW_searchRetrieveRequest *)
+		odr_malloc(o, sizeof(*req));
             req->query_type = Z_SRW_query_type_cql;
             req->query.cql = 0;
             req->sort_type = Z_SRW_sort_type_none;
@@ -497,7 +510,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             Z_SRW_searchRetrieveResponse *res;
 
             (*p)->which = Z_SRW_searchRetrieve_response;
-            res = (*p)->u.response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.response = (Z_SRW_searchRetrieveResponse *)
+		odr_malloc(o, sizeof(*res));
 
             res->numberOfRecords = 0;
             res->resultSetId = 0;
@@ -541,7 +555,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 	    xmlNodePtr ptr = method->children;
             
             (*p)->which = Z_SRW_explain_request;
-            req = (*p)->u.explain_request = odr_malloc(o, sizeof(*req));
+            req = (*p)->u.explain_request = (Z_SRW_explainRequest *)
+		odr_malloc(o, sizeof(*req));
 	    req->recordPacking = 0;
 	    req->database = 0;
 	    req->stylesheet = 0;
@@ -567,9 +582,14 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_explain_response;
-            res = (*p)->u.explain_response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.explain_response = (Z_SRW_explainResponse*)
+		odr_malloc(o, sizeof(*res));
             res->diagnostics = 0;
             res->num_diagnostics = 0;
+	    res->record.recordSchema = 0;
+	    res->record.recordData_buf = 0;
+	    res->record.recordData_len = 0;
+	    res->record.recordPosition = 0;
 
 	    for (; ptr; ptr = ptr->next)
 	    {
@@ -591,12 +611,14 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_scan_request;
-            req = (*p)->u.scan_request = odr_malloc(o, sizeof(*req));
-	    req->database = 0;
-	    req->scanClause = 0;
-	    req->stylesheet = 0;
+            req = (*p)->u.scan_request = (Z_SRW_scanRequest *)
+		odr_malloc(o, sizeof(*req));
+	    req->query_type = Z_SRW_query_type_cql;
+	    req->scanClause.cql = 0;
 	    req->responsePosition = 0;
 	    req->maximumTerms = 0;
+	    req->stylesheet = 0;
+	    req->database = 0;
 	    
 	    for (; ptr; ptr = ptr->next)
 	    {
@@ -604,8 +626,13 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 				     &(*p)->srw_version))
 		    ;
 		else if (match_xsd_string(ptr, "scanClause", o,
-				     &req->scanClause))
+				     &req->scanClause.cql))
 		    ;
+		else if (match_xsd_string(ptr, "pScanClause", o,
+					  &req->scanClause.pqf))
+		{
+		    req->query_type = Z_SRW_query_type_pqf;
+		}
 		else if (match_xsd_integer(ptr, "responsePosition", o,
 					   &req->responsePosition))
 		    ;
@@ -626,7 +653,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_scan_response;
-            res = (*p)->u.scan_response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.scan_response = (Z_SRW_scanResponse *)
+		odr_malloc(o, sizeof(*res));
 	    res->terms = 0;
 	    res->num_terms = 0;
 	    res->diagnostics = 0;
@@ -768,7 +796,15 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 	    xmlSetNs(ptr, ns_srw);
 
 	    add_xsd_string(ptr, "version", (*p)->srw_version);
-	    add_xsd_string(ptr, "scanClause", req->scanClause);
+	    switch(req->query_type)
+	    {
+	    case Z_SRW_query_type_cql:
+		add_xsd_string(ptr, "scanClause", req->scanClause.cql);
+		break;
+	    case Z_SRW_query_type_pqf:
+		add_xsd_string(ptr, "pScanClause", req->scanClause.pqf);
+		break;
+	    }
 	    add_xsd_integer(ptr, "responsePosition", req->responsePosition);
 	    add_xsd_integer(ptr, "maximumTerms", req->maximumTerms);
 	    add_xsd_string(ptr, "stylesheet", req->stylesheet);