&ex.extraRecordData_buf,
&ex.extraRecordData_len) )
;
- else if (match_xsd_string(ptr, "recordIdentifier", o,
- &ex.recordIdentifier))
- ;
-
+ else
+ match_xsd_string(ptr, "recordIdentifier", o,
+ &ex.recordIdentifier);
}
if (data_ptr)
{
if (match_xsd_string(ptr, "versionType", o,
&rec->versionType))
;
- else if (match_xsd_string(ptr, "versionValue", o,
- &rec->versionValue))
- ;
+ else
+ match_xsd_string(ptr, "versionValue", o, &rec->versionValue);
}
}
else if (o->direction == ODR_ENCODE)
Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node)
{
- int freq;
+ Odr_int freq;
xmlNodePtr child;
WRBUF wrbuf = wrbuf_alloc();
- const char *freq_string = yaz_element_attribute_value_get(node, "facetvalue", "est_representation");
- Z_Term *term;
+ Z_FacetTerm *facet_term;
+ const char *freq_string = yaz_element_attribute_value_get(
+ node, "facetvalue", "est_representation");
if (freq_string)
- freq = atoi(freq_string);
+ freq = odr_atoi(freq_string);
else
freq = -1;
- for (child = node->children; child ; child = child->next) {
+ for (child = node->children; child ; child = child->next)
+ {
if (child->type == XML_TEXT_NODE)
wrbuf_puts(wrbuf, (const char *) child->content);
}
- term = term_create(odr, wrbuf_cstr(wrbuf));
- yaz_log(YLOG_DEBUG, "sru-proxy facet: %s %d", wrbuf_cstr(wrbuf), freq);
+ facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq);
wrbuf_destroy(wrbuf);
- return facet_term_create(odr, term, freq);
+ return facet_term;
};
static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr)
const char* name = yaz_element_attribute_value_get(ptr, "facet", "code");
yaz_log(YLOG_DEBUG, "sru-proxy facet type: %s", name);
- list = yaz_use_atttribute_create(odr, name);
+ list = yaz_use_attribute_create(odr, name);
for (node = ptr->children; node; node = node->next) {
if (match_element(node, "facetvalue"))
num_terms++;
{
if (match_element(node, "facetvalue"))
{
- facet_field_term_set(odr, facet_field, yaz_sru_proxy_get_facet_term_count(odr, node), index);
+ facet_field_term_set(odr, facet_field,
+ yaz_sru_proxy_get_facet_term_count(odr, node),
+ index);
index++;
}
}
else if (match_xsd_string(rptr, "details", o,
&(*recs)[i].details))
;
- else if (match_xsd_string(rptr, "message", o,
- &(*recs)[i].message))
- ;
+ else
+ match_xsd_string(rptr, "message", o, &(*recs)[i].message);
}
i++;
}
else if (match_xsd_string(ptr, "displayTerm", o,
&term->displayTerm))
;
- else if (match_xsd_string(ptr, "whereInList", o,
- &term->whereInList))
- ;
+ else
+ match_xsd_string(ptr, "whereInList", o, &term->whereInList);
}
}
else if (o->direction == ODR_ENCODE)
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
- ;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
if (!req->query.cql && !req->query.pqf && !req->query.xcql)
{
else if (match_xsd_string(ptr, "recordPacking", o,
&req->recordPacking))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
- ;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainResponse"))
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
- ;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "scanResponse"))
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
- ;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "updateResponse"))