Fix sequence of diagnostic element

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

diff --git a/src/srw.c b/src/srw.c
index cf22d06..7fb30b4 100644 (file)
--- a/src/srw.c
+++ b/src/srw.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.15 2004-01-07 20:36:44 adam Exp $
+ * $Id: srw.c,v 1.18 2004-01-15 23:33:29 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -26,7 +26,7 @@ static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len)
     }
 }
 
-xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, char *val,
+xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, const char *val,
                            int len)
 {
     if (val)
@@ -39,14 +39,14 @@ xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, char *val,
     return 0;
 }
 
-xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, char *val)
+xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
 {
     if (val)
         return xmlNewChild(ptr, 0, elem, val);
     return 0;
 }
 
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem, int *val)
+static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
 {
     if (val)
     {
@@ -318,6 +318,12 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
         {
             xmlNodePtr rptr = xmlNewChild(pptr, ns_diag, "diagnostic", 0);
             add_xsd_integer(rptr, "code", (*recs)[i].code);
+           if ((*recs)[i].code)
+           {
+               const char *message = yaz_diag_srw_str(*(*recs)[i].code);
+               if (message)
+                   add_xsd_string(rptr, "message", message);
+           }
             add_xsd_string(rptr, "details", (*recs)[i].details);
         }
     }
@@ -433,7 +439,10 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 
             for (; ptr; ptr = ptr->next)
             {
-                if (match_xsd_string(ptr, "query", o, 
+               if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                    ;
+                else if (match_xsd_string(ptr, "query", o, 
                                      &req->query.cql))
                     req->query_type = Z_SRW_query_type_cql;
                 else if (match_xsd_string(ptr, "pQuery", o, 
@@ -442,36 +451,33 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 else if (match_xsd_string(ptr, "xQuery", o, 
                                      &req->query.xcql))
                     req->query_type = Z_SRW_query_type_xcql;
-                else if (match_xsd_string(ptr, "sortKeys", o, 
-                                          &req->sort.sortKeys))
-                    req->sort_type = Z_SRW_sort_type_sort;
-                else if (match_xsd_string(ptr, "recordSchema", o, 
-                                          &req->recordSchema))
+                else if (match_xsd_integer(ptr, "startRecord", o,
+                                           &req->startRecord))
+                    ;
+                else if (match_xsd_integer(ptr, "maximumRecords", o,
+                                           &req->maximumRecords))
                     ;
                 else if (match_xsd_string(ptr, "recordPacking", o,
                                           &req->recordPacking))
                     ;
+                else if (match_xsd_string(ptr, "recordSchema", o, 
+                                          &req->recordSchema))
+                    ;
                 else if (match_xsd_string(ptr, "recordXPath", o,
                                           &req->recordXPath))
                     ;
-                else if (match_xsd_integer(ptr, "startRecord", o,
-                                           &req->startRecord))
-                    ;
-                else if (match_xsd_integer(ptr, "maximumRecords", o,
-                                           &req->maximumRecords))
+                else if (match_xsd_string(ptr, "resultSetTTL", o,
+                                           &req->database))
                     ;
+                else if (match_xsd_string(ptr, "sortKeys", o, 
+                                          &req->sort.sortKeys))
+                    req->sort_type = Z_SRW_sort_type_sort;
                 else if (match_xsd_string(ptr, "stylesheet", o,
                                            &req->stylesheet))
                     ;
                 else if (match_xsd_string(ptr, "database", o,
                                            &req->database))
                     ;
-                else if (match_xsd_string(ptr, "resultSetTTL", o,
-                                           &req->database))
-                    ;
-                else if (match_xsd_string(ptr, "version", o,
-                                           &(*p)->srw_version))
-                    ;
                 /* missing is xQuery, xSortKeys .. */
             }
         }
@@ -494,7 +500,10 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 
             for (; ptr; ptr = ptr->next)
             {
-                if (match_xsd_integer(ptr, "numberOfRecords", o, 
+                if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                    ;
+                else if (match_xsd_integer(ptr, "numberOfRecords", o, 
                                       &res->numberOfRecords))
                     ;
                 else if (match_xsd_string(ptr, "resultSetId", o, 
@@ -507,16 +516,13 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                     yaz_srw_records(o, ptr, &res->records,
                                     &res->num_records, client_data,
                                     ns);
+                else if (match_xsd_integer(ptr, "nextRecordPosition", o,
+                                           &res->nextRecordPosition))
+                    ;
                 else if (match_element(ptr, "diagnostics"))
                     yaz_srw_diagnostics(o, ptr, &res->diagnostics,
                                         &res->num_diagnostics,
                                         client_data, ns);
-                else if (match_xsd_integer(ptr, "nextRecordPosition", o,
-                                           &res->nextRecordPosition))
-                    ;
-                else if (match_xsd_string(ptr, "version", o,
-                                           &(*p)->srw_version))
-                    ;
             }
         }
         else if (!strcmp(method->name, "explainRequest"))
@@ -531,18 +537,18 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
            req->stylesheet = 0;
            for (; ptr; ptr = ptr->next)
            {
-               if (match_xsd_string(ptr, "database", o,
-                                    &req->database))
-                    ;
+                if (match_xsd_string(ptr, "version", o,
+                                           &(*p)->srw_version))
+                   ;
                else if (match_xsd_string(ptr, "stylesheet", o,
                                          &req->stylesheet))
                    ;
                else if (match_xsd_string(ptr, "recordPacking", o,
                                     &req->recordPacking))
                    ;
-                else if (match_xsd_string(ptr, "version", o,
-                                           &(*p)->srw_version))
-                   ;
+               else if (match_xsd_string(ptr, "database", o,
+                                    &req->database))
+                    ;
            }
         }
         else if (!strcmp(method->name, "explainResponse"))
@@ -557,11 +563,11 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 
            for (; ptr; ptr = ptr->next)
            {
-               if (match_element(ptr, "record"))
-                   yaz_srw_record(o, ptr, &res->record, client_data, ns);
-                else if (match_xsd_string(ptr, "version", o,
-                                         &(*p)->srw_version))
+                if (match_xsd_string(ptr, "version", o,
+                                           &(*p)->srw_version))
                    ;
+               else if (match_element(ptr, "record"))
+                   yaz_srw_record(o, ptr, &res->record, client_data, ns);
                else if (match_element(ptr, "diagnostics"))
                     yaz_srw_diagnostics(o, ptr, &res->diagnostics,
                                         &res->num_diagnostics,
@@ -590,18 +596,18 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                else if (match_xsd_string(ptr, "scanClause", o,
                                     &req->scanClause))
                    ;
-               else if (match_xsd_string(ptr, "database", o,
-                                         &req->database))
-                    ;
-               else if (match_xsd_string(ptr, "stylesheet", o,
-                                         &req->stylesheet))
-                   ;
                else if (match_xsd_integer(ptr, "responsePosition", o,
                                           &req->responsePosition))
                    ;
                else if (match_xsd_integer(ptr, "maximumTerms", o,
                                           &req->maximumTerms))
                     ;
+               else if (match_xsd_string(ptr, "stylesheet", o,
+                                         &req->stylesheet))
+                   ;
+               else if (match_xsd_string(ptr, "database", o,
+                                         &req->database))
+                    ;
            }
         }
         else if (!strcmp(method->name, "scanResponse"))
@@ -618,7 +624,10 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
            
            for (; ptr; ptr = ptr->next)
            {
-                if (match_element(ptr, "terms"))
+               if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                   ;
+                else if (match_element(ptr, "terms"))
                     yaz_srw_terms(o, ptr, &res->terms,
                                  &res->num_terms, client_data,
                                  ns);
@@ -626,9 +635,6 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                     yaz_srw_diagnostics(o, ptr, &res->diagnostics,
                                         &res->num_diagnostics,
                                         client_data, ns);
-               else if (match_xsd_string(ptr, "version", o,
-                                         &(*p)->srw_version))
-                   ;
            }
         }
         else
@@ -664,6 +670,12 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 add_xsd_string(ptr, "pQuery", req->query.pqf);
                 break;
             }
+            add_xsd_integer(ptr, "startRecord", req->startRecord);
+            add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
+            add_xsd_string(ptr, "recordPacking", req->recordPacking);
+            add_xsd_string(ptr, "recordSchema", req->recordSchema);
+            add_xsd_string(ptr, "recordXPath", req->recordXPath);
+            add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL);
             switch(req->sort_type)
             {
             case Z_SRW_sort_type_none:
@@ -675,14 +687,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 add_xsd_string(ptr, "xSortKeys", req->sort.xSortKeys);
                 break;
             }
-            add_xsd_integer(ptr, "startRecord", req->startRecord);
-            add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
-            add_xsd_string(ptr, "recordSchema", req->recordSchema);
-            add_xsd_string(ptr, "recordPacking", req->recordPacking);
-            add_xsd_string(ptr, "recordXPath", req->recordXPath);
-            add_xsd_string(ptr, "database", req->database);
-            add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL);
             add_xsd_string(ptr, "stylesheet", req->stylesheet);
+            add_xsd_string(ptr, "database", req->database);
         }
         else if ((*p)->which == Z_SRW_searchRetrieve_response)
         {
@@ -703,13 +709,14 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 yaz_srw_records(o, rptr, &res->records, &res->num_records,
                                 client_data, ns);
             }
+            add_xsd_integer(ptr, "nextRecordPosition",
+                           res->nextRecordPosition);
             if (res->num_diagnostics)
             {
                 xmlNodePtr rptr = xmlNewChild(ptr, 0, "diagnostics", 0);
                 yaz_srw_diagnostics(o, rptr, &res->diagnostics,
                                     &res->num_diagnostics, client_data, ns);
             }
-            add_xsd_integer(ptr, "nextRecordPosition", res->nextRecordPosition);
         }
         else if ((*p)->which == Z_SRW_explain_request)
         {
@@ -721,6 +728,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
            add_xsd_string(ptr, "version", (*p)->srw_version);
             add_xsd_string(ptr, "recordPacking", req->recordPacking);
             add_xsd_string(ptr, "stylesheet", req->stylesheet);
+            add_xsd_string(ptr, "database", req->database);
         }
         else if ((*p)->which == Z_SRW_explain_response)
         {
@@ -754,6 +762,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
            add_xsd_integer(ptr, "responsePosition", req->responsePosition);
            add_xsd_integer(ptr, "maximumTerms", req->maximumTerms);
            add_xsd_string(ptr, "stylesheet", req->stylesheet);
+            add_xsd_string(ptr, "database", req->database);
         }
         else if ((*p)->which == Z_SRW_scan_response)
         {