X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=88449f35a9dc02a1ea1710179a98971f2e2661d6;hb=d3d51bee2100324025f7530d4e3ff3502397fd83;hp=96695fc600dc7ee4c2d3dd0ef0b84842b6bf0427;hpb=7df9354855b031f0505b84e0c20d2dcc000a54be;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 96695fc..88449f3 100644
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-config.cpp,v 1.17 2003-12-22 15:16:23 adam Exp $
+ * $Id: yaz-proxy-config.cpp,v 1.27 2004-01-30 00:38:28 adam Exp $
  */
 
 #include <ctype.h>
@@ -12,7 +12,7 @@
 Yaz_ProxyConfig::Yaz_ProxyConfig()
 {
     m_copy = 0;
-#if HAVE_XML2
+#if HAVE_XSLT
     m_docPtr = 0;
     m_proxyPtr = 0;
 #endif
@@ -20,7 +20,7 @@ Yaz_ProxyConfig::Yaz_ProxyConfig()
 
 Yaz_ProxyConfig::~Yaz_ProxyConfig()
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     if (!m_copy && m_docPtr)
 	xmlFreeDoc(m_docPtr);
 #endif
@@ -28,7 +28,7 @@ Yaz_ProxyConfig::~Yaz_ProxyConfig()
 
 int Yaz_ProxyConfig::read_xml(const char *fname)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlDocPtr ndoc = xmlParseFile(fname);
 
     if (!ndoc)
@@ -56,7 +56,7 @@ int Yaz_ProxyConfig::read_xml(const char *fname)
 #endif
 }
 
-#if HAVE_XML2
+#if HAVE_XSLT
 const char *Yaz_ProxyConfig::get_text(xmlNodePtr ptr)
 {
     for(ptr = ptr->children; ptr; ptr = ptr->next)
@@ -74,7 +74,7 @@ const char *Yaz_ProxyConfig::get_text(xmlNodePtr ptr)
 }
 #endif
 
-#if HAVE_XML2
+#if HAVE_XSLT
 void Yaz_ProxyConfig::return_limit(xmlNodePtr ptr,
 				   int *limit_bw,
 				   int *limit_pdu,
@@ -107,7 +107,7 @@ void Yaz_ProxyConfig::return_limit(xmlNodePtr ptr,
 }
 #endif
 
-#if HAVE_XML2
+#if HAVE_XSLT
 void Yaz_ProxyConfig::return_target_info(xmlNodePtr ptr,
 					 const char **url,
 					 int *limit_bw,
@@ -220,7 +220,7 @@ int Yaz_ProxyConfig::match_list(int v, const char *m)
   return 0;
 }
 
-#if HAVE_XML2
+#if HAVE_XSLT
 int Yaz_ProxyConfig::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
 					     Z_AttributeList *attrs,
 					     char **addinfo)
@@ -293,7 +293,7 @@ int Yaz_ProxyConfig::check_type_1_attributes(ODR odr, xmlNodePtr ptrl,
 }
 #endif
 
-#if HAVE_XML2
+#if HAVE_XSLT
 int Yaz_ProxyConfig::check_type_1_structure(ODR odr, xmlNodePtr ptr,
 					    Z_RPNStructure *q,
 					    char **addinfo)
@@ -319,7 +319,7 @@ int Yaz_ProxyConfig::check_type_1_structure(ODR odr, xmlNodePtr ptr,
 }
 #endif
 
-#if HAVE_XML2
+#if HAVE_XSLT
 int Yaz_ProxyConfig::check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
 				  char **addinfo)
 {
@@ -331,7 +331,7 @@ int Yaz_ProxyConfig::check_type_1(ODR odr, xmlNodePtr ptr, Z_RPNQuery *query,
 int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query,
 				 char **addinfo)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlNodePtr ptr;
     
     ptr = find_target_node(name, 0);
@@ -344,10 +344,66 @@ int Yaz_ProxyConfig::check_query(ODR odr, const char *name, Z_Query *query,
     return 0;
 }
 
+#if HAVE_XSLT
+int Yaz_ProxyConfig::check_schema(xmlNodePtr ptr, Z_RecordComposition *comp,
+				  const char *schema_identifier)
+{
+    char *esn = 0;
+    int default_match = 1;
+    if (comp && comp->which == Z_RecordComp_simple &&
+	comp->u.simple && comp->u.simple->which == Z_ElementSetNames_generic)
+    {
+	esn = comp->u.simple->u.generic;
+    }
+    // if no ESN/schema was given accept..
+    if (!esn)
+	return 1;
+    // check if schema identifier match
+    if (schema_identifier && !strcmp(esn, schema_identifier))
+	return 1;
+    // Check each name element
+    for (; ptr; ptr = ptr->next)
+    {
+	if (ptr->type == XML_ELEMENT_NODE 
+	    && !strcmp((const char *) ptr->name, "name"))
+	{
+	    xmlNodePtr tptr = ptr->children;
+	    default_match = 0;
+	    for (; tptr; tptr = tptr->next)
+		if (tptr->type == XML_TEXT_NODE && tptr->content)
+		{
+		    xmlChar *t = tptr->content;
+		    while (*t && isspace(*t))
+			t++;
+		    int i = 0;
+		    while (esn[i] && esn[i] == t[i])
+			i++;
+		    if (!esn[i] && (!t[i] || isspace(t[i])))
+			return 1;
+		}
+	}
+    }
+    return default_match;
+}
+#endif
+
 int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
-				  Odr_oid *syntax, char **addinfo)
+				  Odr_oid *syntax, Z_RecordComposition *comp,
+				  char **addinfo,
+				  char **stylesheet, char **schema)
 {
-#if HAVE_XML2
+    if (stylesheet)
+    {
+	xfree (*stylesheet);
+	*stylesheet = 0;
+    }
+    if (schema)
+    {
+	xfree (*schema);
+	*schema = 0;
+    }
+#if HAVE_XSLT
+    int syntax_has_matched = 0;
     xmlNodePtr ptr;
     
     ptr = find_target_node(name, 0);
@@ -362,6 +418,8 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
 	    const char *match_type = 0;
 	    const char *match_error = 0;
 	    const char *match_marcxml = 0;
+	    const char *match_stylesheet = 0;
+	    const char *match_identifier = 0;
 	    struct _xmlAttr *attr;
 	    for (attr = ptr->properties; attr; attr = attr->next)
 	    {
@@ -374,6 +432,12 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
 		if (!strcmp((const char *) attr->name, "marcxml") &&
 		    attr->children && attr->children->type == XML_TEXT_NODE)
 		    match_marcxml = (const char *) attr->children->content;
+		if (!strcmp((const char *) attr->name, "stylesheet") &&
+		    attr->children && attr->children->type == XML_TEXT_NODE)
+		    match_stylesheet = (const char *) attr->children->content;
+		if (!strcmp((const char *) attr->name, "identifier") &&
+		    attr->children && attr->children->type == XML_TEXT_NODE)
+		    match_identifier = (const char *) attr->children->content;
 	    }
 	    if (match_type)
 	    {
@@ -394,12 +458,30 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
 	    }
 	    if (match)
 	    {
+		if (!match_error)
+		    syntax_has_matched = 1;
+		match = check_schema(ptr->children, comp, match_identifier);
+	    }
+	    if (match)
+	    {
+		if (stylesheet && match_stylesheet)
+		{
+		    xfree(*stylesheet);
+		    *stylesheet = xstrdup(match_stylesheet);
+		}
+		if (schema && match_identifier)
+		{
+		    xfree(*schema);
+		    *schema = xstrdup(match_identifier);
+		}
 		if (match_marcxml)
 		{
 		    return -1;
 		}
 		if (match_error)
 		{
+		    if (syntax_has_matched)  // if syntax OK, bad schema/ESN
+			return 25;
 		    if (syntax)
 		    {
 			char dotoid_str[100];
@@ -416,7 +498,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
     return 0;
 }
 
-#if HAVE_XML2
+#if HAVE_XSLT
 xmlNodePtr Yaz_ProxyConfig::find_target_db(xmlNodePtr ptr, const char *db)
 {
     xmlNodePtr dptr;
@@ -509,7 +591,7 @@ int Yaz_ProxyConfig::get_target_no(int no,
 				   int *pre_init,
 				   const char **cql2rpn)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_proxyPtr)
 	return 0;
@@ -551,7 +633,7 @@ int Yaz_ProxyConfig::mycmp(const char *hay, const char *item, size_t len)
 void Yaz_ProxyConfig::get_generic_info(int *log_mask,
 				       int *max_clients)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_proxyPtr)
 	return;
@@ -603,7 +685,7 @@ void Yaz_ProxyConfig::get_generic_info(int *log_mask,
 char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
 				   int *len)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlNodePtr ptr = find_target_node(name, db);
     if (ptr)
     {
@@ -612,6 +694,30 @@ char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
 	    if (ptr->type == XML_ELEMENT_NODE &&
 		!strcmp((const char *) ptr->name, "explain"))
 	    {
+		xmlNodePtr ptr1 = ptr->children;
+		if (db)
+		{
+		    for (; ptr1; ptr1 = ptr1->next)
+			if (ptr1->type == XML_ELEMENT_NODE &&
+			    !strcmp((const char *) ptr1->name, "serverInfo"))
+			    break;
+		    if (!ptr1)
+			continue;
+		    for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
+			if (ptr1->type == XML_ELEMENT_NODE &&
+			    !strcmp((const char *) ptr1->name, "database"))
+			    break;
+		    
+		    if (!ptr1)
+			continue;
+		    for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
+			if (ptr1->type == XML_TEXT_NODE &&
+			    ptr1->content &&
+			    !strcmp((const char *) ptr1->content, db))
+			    break;
+		    if (!ptr1)
+			continue;
+		}
 		xmlNodePtr ptr2 = xmlCopyNode(ptr, 1);
 
 		xmlDocPtr doc = xmlNewDoc((const xmlChar *) "1.0");
@@ -619,7 +725,6 @@ char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
 		xmlDocSetRootElement(doc, ptr2);
 		
 		xmlChar *buf_out;
-		int len_out;
 		xmlDocDumpMemory(doc, &buf_out, len);
 		char *content = (char*) odr_malloc(odr, *len);
 		memcpy(content, buf_out, *len);
@@ -629,11 +734,7 @@ char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
 		return content;
 	    }
     }
-    else
-	yaz_log(LOG_WARN, "No explain node 1");
-
 #endif
-    yaz_log(LOG_WARN, "No explain node");
     return 0;
 }
 
@@ -650,7 +751,7 @@ void Yaz_ProxyConfig::get_target_info(const char *name,
 				      int *pre_init,
 				      const char **cql2rpn)
 {
-#if HAVE_XML2
+#if HAVE_XSLT
     xmlNodePtr ptr;
     if (!m_proxyPtr)
     {