/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
#include <yaz/oid_db.h>
#include <yaz/oid_std.h>
#include <yaz/otherinfo.h>
+#include <yaz/pquery.h>
#include <assert.h>
+void yaz_oi_set_facetlist(
+ Z_OtherInformation **otherInformation, ODR odr,
+ Z_FacetList *facet_list)
+{
+ int categoryValue = 1;
+ Z_External *z_external = 0;
+ Z_OtherInformationUnit *oi =
+ yaz_oi_update(otherInformation, odr, yaz_oid_userinfo_facet_1,
+ categoryValue, 0);
+ if (!oi)
+ return;
+ oi->which = Z_OtherInfo_externallyDefinedInfo;
+ z_external = odr_malloc(odr, sizeof(*z_external));
+ z_external->which = Z_External_userFacets;
+ z_external->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
+ z_external->indirect_reference = 0;
+ z_external->descriptor = 0;
+ z_external->u.facetList = facet_list;
+ oi->information.externallyDefinedInfo = z_external;
+}
+
+Z_FacetList *yaz_oi_get_facetlist(Z_OtherInformation **otherInformation)
+{
+ int categoryValue = 1;
+ Z_External *z_external = 0;
+ Z_OtherInformationUnit *oi =
+ yaz_oi_update(otherInformation, 0, yaz_oid_userinfo_facet_1,
+ categoryValue, 0);
+ if (!oi)
+ return 0;
+ z_external = oi->information.externallyDefinedInfo;
+
+ if (z_external && z_external->which == Z_External_userFacets)
+ return z_external->u.facetList;
+ return 0;
+}
+
/* Little helper to extract a string attribute */
/* Gets the first string, there is usually only one */
/* in case of errors, returns null */
-void facet_struct_init(struct yaz_facet_attr *attr_values)
+void yaz_facet_attr_init(struct yaz_facet_attr *attr_values)
{
attr_values->errcode = 0;
attr_values->errstring = 0;
attr_values->limit = 0;
}
-const char *stringattr(Z_ComplexAttribute *c)
+static const char *stringattr(Z_ComplexAttribute *c)
{
int i;
Z_StringOrNumeric *son;
}
/* Use attribute, @attr1, can be numeric or string */
-void useattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
+static void useattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
{
const char *s;
if (ae->which == Z_AttributeValue_complex)
{
s = stringattr(ae->value.complex);
- yaz_log(YLOG_DEBUG, "useattr %s %s", s, av->useattr);
if (s)
{
if (!av->useattr)
sprintf(av->useattrbuff, ODR_INT_PRINTF, *ae->value.numeric);
av->useattr = av->useattrbuff;
}
-} /* useattr */
+}
-/* TODO rename to sortorder attr */
-void relationattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
+static void sortorderattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
{
if (ae->which == Z_AttributeValue_numeric)
{
if (*ae->value.numeric == 0)
av->relation = "desc";
else if (*ae->value.numeric == 1)
- av->relation = "asc";
- else
- if (*ae->value.numeric == 3) {
+ av->relation = "asc";
+ else if (*ae->value.numeric == 3)
av->relation = "unknown/unordered";
- } else {
+ else
+ {
av->errcode = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE;
sprintf(av->useattrbuff, ODR_INT_PRINTF,
- *ae-> attributeType);
+ *ae-> attributeType);
av->errstring = av->useattrbuff;
}
}
av->errcode = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE;
av->errstring = "non-numeric relation attribute";
}
-} /* relationattr */
+}
-void limitattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
+static void limitattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
{
if (ae->which == Z_AttributeValue_numeric)
{
av->limit = *ae->value.numeric;
- yaz_log(YLOG_DEBUG, "limitattr %d ", av->limit);
}
else
{
av->errcode = YAZ_BIB1_UNSUPP_ATTRIBUTE;
av->errstring = "non-numeric limit attribute";
}
-} /* relationattr */
+}
/* Get the index to be searched from the attributes.
@attr 1
so no need to free that string!
*/
-void facetattrs(Z_AttributeList *attributes, struct yaz_facet_attr *av)
+void yaz_facet_attr_get_z_attributes(const Z_AttributeList *attributes,
+ struct yaz_facet_attr *av)
{
int i;
Z_AttributeElement *ae;
- yaz_log(YLOG_DEBUG, "Attribute num attributes: %d",
- attributes->num_attributes);
- for (i=0; i < attributes->num_attributes; i++) {
+ for (i = 0; i < attributes->num_attributes; i++)
+ {
ae = attributes->attributes[i];
/* ignoring the attributeSet here */
- yaz_log(YLOG_DEBUG, "Attribute type %d", (int) *ae->attributeType);
if (*ae->attributeType == 1)
{ /* use attribute */
useattr(ae, av);
}
else if (*ae->attributeType == 2)
{ /* sortorder */
- relationattr(ae, av);
+ sortorderattr(ae, av);
}
else if (*ae->attributeType == 3)
{ /* limit */
sprintf(av->useattrbuff, ODR_INT_PRINTF,
*ae-> attributeType);
av->errstring = av->useattrbuff;
- yaz_log(YLOG_DEBUG, "Unsupported attribute type %s", av->useattrbuff);
+ yaz_log(YLOG_WARN, "Unsupported attribute type %s", av->useattrbuff);
/* would like to give a better message, but the standard */
/* tells me to return the attribute type */
}
return;
} /* facetattrs */
-
-Z_FacetList *extract_facet_request(ODR odr, Z_OtherInformation *search_input)
-{
- Z_FacetList *facet_list =
- yaz_oi_get_facetlist_oid(&search_input, odr,
- yaz_oid_userinfo_facet_1, 1, 0);
- return facet_list;
-}
-
+#if 0
Z_Term *term_create(ODR odr, const char *cstr)
{
Z_Term *term = odr_malloc(odr, sizeof(*term));
*facet_term->count = freq;
return facet_term;
}
+#endif
+
+Z_FacetTerm *facet_term_create_cstr(ODR odr, const char *cstr, Odr_int freq)
+{
+ Z_FacetTerm *facet_term = odr_malloc(odr, sizeof(*facet_term));
+ Z_Term *term = z_Term_create(odr, Z_Term_general, cstr, strlen(cstr));
+ facet_term->term = term;
+ facet_term->count = odr_intdup(odr, freq);
+ return facet_term;
+}
Z_FacetField* facet_field_create(ODR odr, Z_AttributeList *attributes,
int num_terms)
projects / yaz-moved-to-github.git / blobdiff