For decoding of OIDs, do more sanity checks , so that we don't end up
[yaz-moved-to-github.git] / src / seshigh.c
index 18ebe90..f47c417 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.71 2006-03-16 08:55:28 adam Exp $
+ * $Id: seshigh.c,v 1.74 2006-04-05 12:05:36 mike Exp $
  */
 /**
  * \file seshigh.c
@@ -517,8 +517,9 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num)
         assoc->backend = binitres->handle;
         if (binitres->errcode)
         {
+            int srw_code = yaz_diag_bib1_to_srw(binitres->errcode);
             assoc->state = ASSOC_DEAD;
-            yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode,
+            yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code,
                                    binitres->errstring);
             return 0;
         }
@@ -641,7 +642,7 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
     int r;
     int srw_errcode = 0;
     const char *add = 0;
-    char rpn_buf[512];
+    char rpn_buf[5120];
             
     r = cql_parser_string(cp, cql);
     if (r)
@@ -1462,6 +1463,7 @@ static void process_http_request(association *assoc, request *req)
                 yaz_mime_types_add(types, "html", "text/html");
                 yaz_mime_types_add(types, "htm", "text/html");
                 yaz_mime_types_add(types, "txt", "text/plain");
+                yaz_mime_types_add(types, "js", "application/x-javascript");
                 
                 yaz_mime_types_add(types, "gif", "image/gif");
                 yaz_mime_types_add(types, "png", "image/png");
@@ -2071,7 +2073,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.71 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.74 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,