Make more room for YAZ version string

[pazpar2-moved-to-github.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 53c1de6..d25f87b 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,15 +5,56 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
-struct conf_termlist
+enum conf_sortkey_types
+{
+    Metadata_sortkey_no,            // This is not to be used as a sortkey
+    Metadata_sortkey_numeric,       // Standard numerical sorting
+    Metadata_sortkey_range,         // Range sorting (pick lowest or highest)
+    Metadata_sortkey_skiparticle,   // Skip leading article when sorting
+    Metadata_sortkey_string
+};
+
+// Describes known metadata elements and how they are to be manipulated
+// An array of these structure provides a 'map' against which discovered metadata
+// elements are matched. It also governs storage, to minimize number of cycles needed
+// at various tages of processing
+struct conf_metadata 
+{
+    char *name;  // The name of this element. Output by normalization stylesheet
+    int brief;   // Is this element to be returned in the brief format?
+    int termlist;// Is this field to be treated as a termlist for browsing?
+    int rank;    // Rank factor. 0 means don't use this field for ranking, 1 is default
+                 // values >1  give additional significance to a field
+    enum
+    {
+        Metadata_type_generic,          // Generic text field
+        Metadata_type_integer,          // Integer type
+        Metadata_type_year              // A year
+    } type;
+    enum conf_sortkey_types sortkey;
+    enum
+    {
+        Metadata_merge_no,              // Don't merge
+        Metadata_merge_unique,          // Include unique elements in merged block
+        Metadata_merge_longest,         // Include the longest (strlen) value
+        Metadata_merge_range,           // Store value as a range of lowest-highest
+        Metadata_merge_all              // Just include all elements found
+    } merge;
+};
+
+// Controls sorting
+struct conf_sortkey
 {
     char *name;
-    struct conf_termlist *next;
+    enum conf_sortkey_types type;
 };
 
 struct conf_service
 {
-    struct conf_termlist *termlists;
+    int num_metadata;
+    struct conf_metadata *metadata;
+    int num_sortkeys;
+    struct conf_sortkey *sortkeys;
 };
 
 struct conf_server
@@ -28,6 +69,7 @@ struct conf_server
 
 struct conf_queryprofile
 {
+    int dummy;
 };
 
 struct conf_retrievalmap