Debug log on facet attribute limit

[yaz-moved-to-github.git] / src / facet.c

diff --git a/src/facet.c b/src/facet.c
index 7baee6b..721b7e3 100644 (file)
--- a/src/facet.c
+++ b/src/facet.c
@@ -2,10 +2,24 @@
 
 #include <yaz/facet.h>
 #include <yaz/diagbib1.h>
+#include <yaz/oid_db.h>
+#include <yaz/oid_std.h>
+#include <yaz/otherinfo.h>
+#include <assert.h>
 
 /* 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 attrvalues *attr_values) {
+    attr_values->errcode   = 0;
+    attr_values->errstring = 0;
+    attr_values->relation  = 0;
+    attr_values->useattr   = 0;
+    attr_values->useattrbuff[0] = 0;
+    attr_values->limit     = 0;
+}
+
 const char *stringattr( Z_ComplexAttribute *c ) {
     int i;
      Z_StringOrNumeric *son;
@@ -24,6 +38,7 @@ void useattr ( Z_AttributeElement *ae,
     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)
                 av->useattr = s;
@@ -72,6 +87,7 @@ void limitattr ( Z_AttributeElement *ae,
   /* TODO - check numeric first, then value! */
     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";
@@ -93,9 +109,11 @@ void facetattrs( Z_AttributeList *attributes,
 {
     int i;
     Z_AttributeElement *ae;
+    yaz_log(YLOG_DEBUG, "Attribute num attributes: %d", attributes->num_attributes);
     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 */
@@ -107,8 +125,7 @@ void facetattrs( Z_AttributeList *attributes,
             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_DEBUG, "Unsupported attribute type %s", av->useattrbuff);
             /* would like to give a better message, but the standard */
             /* tells me to return the attribute type */
         }
@@ -118,3 +135,49 @@ void facetattrs( Z_AttributeList *attributes,
     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;
+}
+
+Z_Term *term_create(ODR odr, const char *cstr) {
+    Z_Term *term = odr_malloc(odr, sizeof(*term));
+    term->which = Z_Term_characterString;
+    term->u.characterString = odr_strdup(odr, cstr);
+    return term;
+}
+
+Z_FacetTerm* facet_term_create(ODR odr, Z_Term *term, int freq) {
+    Z_FacetTerm *facet_term = odr_malloc(odr, sizeof(*facet_term));
+    facet_term->count = odr_malloc(odr, sizeof(*facet_term->count));
+    facet_term->term = term;
+    *facet_term->count = freq;
+    return facet_term;
+}
+
+Z_FacetField* facet_field_create(ODR odr, Z_AttributeList *attributes, int num_terms) {
+    Z_FacetField *facet_field = odr_malloc(odr, sizeof(*facet_field));
+    facet_field->attributes = attributes;
+    facet_field->num_terms = num_terms;
+    facet_field->terms = odr_malloc(odr, num_terms * sizeof(*facet_field->terms));
+    return facet_field;
+}
+
+void facet_field_term_set(ODR odr, Z_FacetField *field, Z_FacetTerm *facet_term, int index) {
+    assert(0 <= index && index < field->num_terms);
+    field->terms[index] = facet_term;
+}
+
+Z_FacetList* facet_list_create(ODR odr, int num_facets) {
+    Z_FacetList *facet_list = odr_malloc(odr, sizeof(*facet_list));
+    facet_list->num = num_facets;
+    facet_list->elements = odr_malloc(odr, facet_list->num * sizeof(*facet_list->elements));
+    return facet_list;
+}
+
+void facet_list_field_set(ODR odr, Z_FacetList *list, Z_FacetField *field, int index) {
+    assert(0 <= index && index < list->num);
+    list->elements[index] = field;
+}
+