- if (ptr->type != XML_ELEMENT_NODE)
- continue;
- struct _xmlAttr *attr = ptr->properties;
- if (!strcmp((const char *) ptr->name, "listen"))
- {
- /*
- <listen id="listenerid">tcp:@:9999</listen>
- */
- const char *id = 0;
- const char *address =
- nmem_dup_xml_content(gfs_nmem, ptr->children);
- for ( ; attr; attr = attr->next)
- if (!strcmp(attr->name, "id")
- && attr->children && attr->children->type == XML_TEXT_NODE)
- id = nmem_dup_xml_content(gfs_nmem, attr->children);
- if (address)
- {
- *gfslp = gfs_listen_new(id, address);
- gfslp = &(*gfslp)->next;
- *gfslp = 0; /* make listener list consistent for search */
- }
- }
- else if (!strcmp((const char *) ptr->name, "server"))
- {
- xmlNodePtr ptr_children = ptr->children;
- xmlNodePtr ptr;
- const char *listenref = 0;
-
- for ( ; attr; attr = attr->next)
- if (!strcmp(attr->name, "listenref")
- && attr->children && attr->children->type == XML_TEXT_NODE)
- listenref = nmem_dup_xml_content(gfs_nmem, attr->children);
- *gfsp = gfs_server_new();
- if (listenref)
- {
- int id_no;
- struct gfs_listen *gl = gfs_listen_list;
- for (id_no = 1; gl; gl = gl->next, id_no++)
- if (gl->id && !strcmp(gl->id, listenref))
- {
- (*gfsp)->listen_ref = id_no;
- break;
- }
- if (!gl)
- yaz_log(YLOG_WARN, "Non-existent listenref '%s' in server "
- "config element", listenref);
- }
- for (ptr = ptr_children; ptr; ptr = ptr->next)
- {
- if (ptr->type != XML_ELEMENT_NODE)
- continue;
- if (!strcmp((const char *) ptr->name, "host"))
- {
- (*gfsp)->host = nmem_dup_xml_content(gfs_nmem,
- ptr->children);
- }
- if (!strcmp((const char *) ptr->name, "config"))
- {
- strcpy((*gfsp)->cb.configname,
- nmem_dup_xml_content(gfs_nmem, ptr->children));
- }
- if (!strcmp((const char *) ptr->name, "pqf2cql"))
- {
- (*gfsp)->cql_transform = cql_transform_open_fname(
- nmem_dup_xml_content(gfs_nmem, ptr->children)
- );
- }
- }
- gfsp = &(*gfsp)->next;
- }
+ struct _xmlAttr *attr;
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ attr = ptr->properties;
+ if (!strcmp((const char *) ptr->name, "listen"))
+ {
+ /*
+ <listen id="listenerid">tcp:@:9999</listen>
+ */
+ const char *id = 0;
+ const char *address =
+ nmem_dup_xml_content(gfs_nmem, ptr->children);
+ for ( ; attr; attr = attr->next)
+ if (!xmlStrcmp(attr->name, BAD_CAST "id")
+ && attr->children && attr->children->type == XML_TEXT_NODE)
+ id = nmem_dup_xml_content(gfs_nmem, attr->children);
+ if (address)
+ {
+ *gfslp = gfs_listen_new(id, address);
+ gfslp = &(*gfslp)->next;
+ *gfslp = 0; /* make listener list consistent for search */
+ }
+ }
+ else if (!strcmp((const char *) ptr->name, "server"))
+ {
+ xmlNodePtr ptr_server = ptr;
+ xmlNodePtr ptr;
+ const char *listenref = 0;
+ const char *id = 0;
+
+ for ( ; attr; attr = attr->next)
+ if (!xmlStrcmp(attr->name, BAD_CAST "listenref")
+ && attr->children && attr->children->type == XML_TEXT_NODE)
+ listenref = nmem_dup_xml_content(gfs_nmem, attr->children);
+ else if (!xmlStrcmp(attr->name, BAD_CAST "id")
+ && attr->children
+ && attr->children->type == XML_TEXT_NODE)
+ id = nmem_dup_xml_content(gfs_nmem, attr->children);
+ else
+ yaz_log(YLOG_WARN, "Unknown attribute '%s' for server",
+ attr->name);
+ *gfsp = gfs_server_new();
+ (*gfsp)->server_node_ptr = ptr_server;
+ if (listenref)
+ {
+ int id_no;
+ struct gfs_listen *gl = gfs_listen_list;
+ for (id_no = 1; gl; gl = gl->next, id_no++)
+ if (gl->id && !strcmp(gl->id, listenref))
+ {
+ (*gfsp)->listen_ref = id_no;
+ break;
+ }
+ if (!gl)
+ yaz_log(YLOG_WARN, "Non-existent listenref '%s' in server "
+ "config element", listenref);
+ }
+ for (ptr = ptr_server->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) ptr->name, "host"))
+ {
+ (*gfsp)->host = nmem_dup_xml_content(gfs_nmem,
+ ptr->children);
+ }
+ else if (!strcmp((const char *) ptr->name, "config"))
+ {
+ strcpy((*gfsp)->cb.configname,
+ nmem_dup_xml_content(gfs_nmem, ptr->children));
+ }
+ else if (!strcmp((const char *) ptr->name, "cql2rpn"))
+ {
+ (*gfsp)->cql_transform = cql_transform_open_fname(
+ nmem_dup_xml_content(gfs_nmem, ptr->children)
+ );
+ }
+ else if (!strcmp((const char *) ptr->name, "directory"))
+ {
+ (*gfsp)->directory =
+ nmem_dup_xml_content(gfs_nmem, ptr->children);
+ }
+ }
+ gfsp = &(*gfsp)->next;
+ }