New suggestions result

[yaz-moved-to-github.git] / include / yaz / facet.h

diff --git a/include/yaz/facet.h b/include/yaz/facet.h
index cd34496..2ff9bc1 100644 (file)
--- a/include/yaz/facet.h
+++ b/include/yaz/facet.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data.
+ * Copyright (C) 1995-2011 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -41,17 +41,16 @@
 
 YAZ_BEGIN_CDECL
 
-
 /*
  * Helper function for extracting facet values from the ASN structures.
  *
  */
 
-/* A helper structure to extract all the attribute stuff
-   from one Z_AttributesList. The pointers will all be to
+/** A helper structure to extract all the attribute stuff
+   from one Z_AttributesList for facets. The pointers will all be to
    the Z-structures, or to constants, so there is no need to
    worry about freeing them */
-struct attrvalues {
+struct yaz_facet_attr {
     int  errcode;   /* set in case of errors */
     char *errstring; /* opt */
     const char *useattr; /* @attr 1, from a string attr */
@@ -63,44 +62,37 @@ struct attrvalues {
 };
 
 YAZ_EXPORT
-void facet_struct_init(struct attrvalues *attr_values);
-
-/* Use attribute, @attr1, can be numeric or string */
-YAZ_EXPORT
-void useattr ( Z_AttributeElement *ae, struct attrvalues *av );
+void yaz_facet_attr_init(struct yaz_facet_attr *attr_values);
 
 YAZ_EXPORT
-void relationattr ( Z_AttributeElement *ae, struct attrvalues *av );
+void yaz_facet_attr_get_z_attributes(const Z_AttributeList *attributes,
+                                    struct yaz_facet_attr *av);
 
 YAZ_EXPORT
-void limitattr ( Z_AttributeElement *ae, struct attrvalues *av );
+Z_FacetTerm *facet_term_create_cstr(ODR odr, const char *cstr, Odr_int freq);
 
 YAZ_EXPORT
-void limitattr ( Z_AttributeElement *ae, struct attrvalues *av );
+Z_FacetField* facet_field_create(ODR odr, Z_AttributeList *attributes,
+                                int num_terms);
 
 YAZ_EXPORT
-void facetattrs( Z_AttributeList *attributes, struct attrvalues *av );
+void facet_field_term_set(ODR odr, Z_FacetField *field,
+                         Z_FacetTerm *facetTerm, int index);
 
 YAZ_EXPORT
-Z_FacetList *extract_facet_request(ODR odr, Z_OtherInformation *search_input);
-
-YAZ_EXPORT
-Z_Term *term_create(ODR odr, const char *cstr);
-
-YAZ_EXPORT
-Z_FacetTerm* facet_term_create(ODR odr, Z_Term *term, int freq);
+Z_FacetList* facet_list_create(ODR odr, int num_facets);
 
 YAZ_EXPORT
-Z_FacetField* facet_field_create(ODR odr, Z_AttributeList *attributes, int num_terms);
-
+void facet_list_field_set(ODR odr, Z_FacetList *list, Z_FacetField *field,
+                         int index);
 YAZ_EXPORT
-void facet_field_term_set(ODR odr, Z_FacetField *field, Z_FacetTerm *facetTerm, int index);
+void yaz_oi_set_facetlist(
+    Z_OtherInformation **otherInformation, ODR odr, Z_FacetList *facet_list);
 
 YAZ_EXPORT
-Z_FacetList* facet_list_create(ODR odr, int num_facets);
+Z_FacetList *yaz_oi_get_facetlist(Z_OtherInformation **otherInformation);
 
-YAZ_EXPORT
-void facet_list_field_set(ODR odr, Z_FacetList *list, Z_FacetField *field, int index);
+YAZ_END_CDECL
 
 #endif
 /*