projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to new m4.
[pazpar2-moved-to-github.git]
/
src
/
test_config.c
diff --git
a/src/test_config.c
b/src/test_config.c
index
b2ada52
..
59e3d73
100644
(file)
--- a/
src/test_config.c
+++ b/
src/test_config.c
@@
-1,7
+1,5
@@
-/* $Id: test_config.c,v 1.1 2007-04-19 19:42:30 marc Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2008 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
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
@@
-14,24
+12,13
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <signal.h>
-#include <ctype.h>
-#include <assert.h>
+*/
#if HAVE_CONFIG_H
#if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
#endif
#define USE_TIMING 0
#endif
#define USE_TIMING 0
@@
-41,9
+28,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/test.h>
#include <yaz/test.h>
-
-//#include "pazpar2.h"
-#include "config.h"
+#include "pazpar2_config.h"
@@
-52,7
+37,7
@@
void test_conf_service(int argc, char **argv)
NMEM nmem = nmem_create();
struct conf_service *service = 0;
NMEM nmem = nmem_create();
struct conf_service *service = 0;
- service = conf_service_create(nmem, 4, 1);
+ service = conf_service_create(nmem, 4, 3);
YAZ_CHECK(service);
YAZ_CHECK(service);
@@
-60,47
+45,56
@@
void test_conf_service(int argc, char **argv)
YAZ_CHECK(!conf_service_add_metadata(0, service, 0, "dead_nmem",
Metadata_type_generic,
Metadata_merge_unique,
YAZ_CHECK(!conf_service_add_metadata(0, service, 0, "dead_nmem",
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, 0, 0, "service_needed",
Metadata_type_generic,
Metadata_merge_unique,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, 0, 0, "service_needed",
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, -1, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, -1, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 4, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 4, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 0, 0, //missing name
Metadata_type_generic,
Metadata_merge_unique,
1, 1, 1, 0));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 0, 0, //missing name
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
// expected metadata sucesses
YAZ_CHECK(conf_service_add_metadata(nmem, service, 0, "title",
Metadata_type_generic,
Metadata_merge_unique,
1, 1, 1, 0));
// expected metadata sucesses
YAZ_CHECK(conf_service_add_metadata(nmem, service, 0, "title",
Metadata_type_generic,
Metadata_merge_unique,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author",
Metadata_type_generic,
Metadata_merge_longest,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author",
Metadata_type_generic,
Metadata_merge_longest,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn",
Metadata_type_number,
Metadata_merge_no,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn",
Metadata_type_number,
Metadata_merge_no,
+ Metadata_setting_no,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year",
Metadata_type_year,
Metadata_merge_range,
1, 1, 1, 0));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year",
Metadata_type_year,
Metadata_merge_range,
+ Metadata_setting_no,
1, 1, 1, 0));
1, 1, 1, 0));
@@
-117,7
+111,7
@@
void test_conf_service(int argc, char **argv)
YAZ_CHECK(!conf_service_add_sortkey(nmem, service, -1, "out_of_bounds",
Metadata_sortkey_string));
YAZ_CHECK(!conf_service_add_sortkey(nmem, service, -1, "out_of_bounds",
Metadata_sortkey_string));
- YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 1, "out_of_bounds",
+ YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 3, "out_of_bounds",
Metadata_sortkey_relevance));
YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 0, 0, //missing name
Metadata_sortkey_relevance));
YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 0, 0, //missing name
@@
-125,13
+119,20
@@
void test_conf_service(int argc, char **argv)
// expected sortkey sucess
// expected sortkey sucess
- YAZ_CHECK(conf_service_add_sortkey(nmem, service, 0, "title",
+ YAZ_CHECK(conf_service_add_sortkey(nmem, service, 0, "relevance",
Metadata_sortkey_relevance));
Metadata_sortkey_relevance));
+
+ YAZ_CHECK(conf_service_add_sortkey(nmem, service, 1, "title",
+ Metadata_sortkey_string));
+
+ YAZ_CHECK(conf_service_add_sortkey(nmem, service, 2, "year",
+ Metadata_sortkey_numeric));
+
nmem_destroy(nmem);
//YAZ_CHECK(0 == 0);
nmem_destroy(nmem);
//YAZ_CHECK(0 == 0);