Added include stdlib.h.

[yazproxy-moved-to-github.git] / src / yaz-proxy-config.cpp

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 804018b..903d3dd 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-config.cpp,v 1.10 2004-11-30 21:10:45 adam Exp $
+/* $Id: yaz-proxy-config.cpp,v 1.12 2004-12-13 20:52:33 adam Exp $
    Copyright (c) 1998-2004, Index Data.
 
 This file is part of the yaz-proxy.
@@ -20,16 +20,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  */
 
 #include <ctype.h>
-#include <yaz/ylog.h>
-#include <yazproxy/proxy.h>
-
-#if HAVE_XSLT
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xinclude.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-#endif
+#include <yaz/log.h>
+#include "proxyp.h"
 
 class Yaz_ProxyConfigP {
     friend class Yaz_ProxyConfig;
@@ -459,12 +451,43 @@ int Yaz_ProxyConfigP::check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
 }
 #endif
 
+const char *Yaz_ProxyConfig::check_mime_type(const char *path)
+{
+    struct {
+       const char *mask;
+       const char *type;
+    } types[] = {
+       {".xml", "text/xml"},
+       {".xsl", "text/xml"},
+       {".tkl", "text/xml"},
+       {".xsd", "text/xml"},
+       {0, "text/plain"},
+       {0, 0},
+    };
+    int i;
+    size_t plen = strlen (path);
+    for (i = 0; types[i].type; i++)
+       if (types[i].mask == 0)
+           return types[i].type;
+       else
+       {
+           size_t mlen = strlen(types[i].mask);
+           if (plen > mlen && !memcmp(path+plen-mlen, types[i].mask, mlen))
+               return types[i].type;
+       }
+    return "application/octet-stream";
+}
+
+
 int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                                  Odr_oid *syntax, Z_RecordComposition *comp,
                                  char **addinfo,
                                  char **stylesheet, char **schema,
                                  char **backend_type,
-                                 char **backend_charset)
+                                 char **backend_charset,
+                                 char **usemarcon_ini_stage1,
+                                 char **usemarcon_ini_stage2
+                                 )
 {
     if (stylesheet)
     {
@@ -486,6 +509,16 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
        xfree (*backend_charset);
        *backend_charset = 0;
     }
+    if (usemarcon_ini_stage1)
+    {
+       xfree (*usemarcon_ini_stage1);
+       *usemarcon_ini_stage1 = 0;
+    }
+    if (usemarcon_ini_stage2)
+    {
+       xfree (*usemarcon_ini_stage2);
+       *usemarcon_ini_stage2 = 0;
+    }
 #if HAVE_XSLT
     int syntax_has_matched = 0;
     xmlNodePtr ptr;
@@ -506,6 +539,8 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
            const char *match_identifier = 0;
            const char *match_backend_type = 0;
            const char *match_backend_charset = 0;
+           const char *match_usemarcon_ini_stage1 = 0;
+           const char *match_usemarcon_ini_stage2 = 0;
            struct _xmlAttr *attr;
            for (attr = ptr->properties; attr; attr = attr->next)
            {
@@ -532,6 +567,14 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                    attr->children && attr->children->type == XML_TEXT_NODE)
                    match_backend_charset = (const char *)
                        attr->children->content;
+               if (!strcmp((const char *) attr->name, "usemarconstage1") &&
+                   attr->children && attr->children->type == XML_TEXT_NODE)
+                   match_usemarcon_ini_stage1 = (const char *)
+                       attr->children->content;
+               if (!strcmp((const char *) attr->name, "usemarconstage2") &&
+                   attr->children && attr->children->type == XML_TEXT_NODE)
+                   match_usemarcon_ini_stage2 = (const char *)
+                       attr->children->content;
            }
            if (match_type)
            {
@@ -579,6 +622,16 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                    xfree(*backend_charset);
                    *backend_charset = xstrdup(match_backend_charset);
                }
+               if (usemarcon_ini_stage1 && match_usemarcon_ini_stage1)
+               {
+                   xfree(*usemarcon_ini_stage1);
+                   *usemarcon_ini_stage1 = xstrdup(match_usemarcon_ini_stage1);
+               }
+               if (usemarcon_ini_stage1 && match_usemarcon_ini_stage2)
+               {
+                   xfree(*usemarcon_ini_stage2);
+                   *usemarcon_ini_stage2 = xstrdup(match_usemarcon_ini_stage2);
+               }
                if (match_marcxml)
                {
                    return -1;