X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=3c03cb3bc1d56dc4b26838d6f276075a10c9eee3;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=4324fa109fffe5873903d94051430dae07832b55;hpb=19a0803f7298f5a0d583f5f70582ba29cb373265;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 4324fa1..3c03cb3 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2013 Index Data
+   Copyright (C) Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -32,8 +32,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
-    Metadata_type_year,        // A number
-    Metadata_type_date        // A number
+    Metadata_type_year,       // year YYYY - YYYY
+    Metadata_type_date,       // date YYYYMMDD - YYYYMMDD
+    Metadata_type_float,      // float number
+    Metadata_type_skiparticle,
+    Metadata_type_relevance,
+    Metadata_type_position,
 };
 
 enum conf_metadata_merge {
@@ -45,14 +49,6 @@ enum conf_metadata_merge {
     Metadata_merge_first      // All from first target
 };
 
-enum conf_sortkey_type {
-    Metadata_sortkey_relevance,
-    Metadata_sortkey_numeric,       // Standard numerical sorting
-    Metadata_sortkey_skiparticle,   // Skip leading article when sorting
-    Metadata_sortkey_string,        // Flat string
-    Metadata_sortkey_position       // Position
-};
-
 // This controls the ability to insert 'static' values from settings into retrieval recs
 enum conf_setting_type {
     Metadata_setting_no,
@@ -94,7 +90,7 @@ struct conf_metadata
 struct conf_sortkey
 {
     char *name;
-    enum conf_sortkey_type type;
+    enum conf_metadata_type type;
 };
 
 struct conf_server;
@@ -134,7 +130,7 @@ struct conf_service
     CCL_bibset ccl_bibset;
     struct database *databases;
     struct conf_server *server;
-    xmlNode *xml_node;
+    char *xml_node;
 };
 
 int conf_service_metadata_field_id(struct conf_service *service, const char * name);