X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_relevance.c;h=b3707f78d40b9d5b3ce215c583446607046518a7;hb=02970d6b3baff57721b3a85f9c227ac45ae973eb;hp=a7683a5dfd62045c02f4c5874f63af5f677d4ed5;hpb=51f7471f0a30c9c6bf5b7a08d70646b1792b3c7c;p=pazpar2-moved-to-github.git diff --git a/src/test_relevance.c b/src/test_relevance.c index a7683a5..b3707f7 100644 --- a/src/test_relevance.c +++ b/src/test_relevance.c @@ -1,7 +1,5 @@ -/* $Id: test_relevance.c,v 1.10 2007-04-25 13:28:55 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 @@ -14,13 +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 -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 + +*/ #if HAVE_CONFIG_H -#include "cconfig.h" +#include #endif #define USE_TIMING 0 @@ -31,28 +29,29 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -#include "config.h" +#include "pazpar2_config.h" #include "relevance.h" #include "record.h" #include "reclists.h" +#if 0 void test_relevance_7bit(int argc, char **argv) { NMEM nmem = nmem_create(); struct conf_service *service = 0; - service = conf_service_create(nmem, 1, 2); + service = conf_service_create(nmem, 1, 1); conf_service_add_metadata(nmem, service, 0, "title", Metadata_type_generic, Metadata_merge_unique, 1, 1, 1, 0); - - conf_service_add_sortkey(nmem, service, 0, "relevance", - Metadata_sortkey_relevance); - conf_service_add_sortkey(nmem, service, 1, "title", + conf_service_add_sortkey(nmem, service, 0, "title", Metadata_sortkey_string); + + //conf_service_add_sortkey(nmem, service, 1, "relevance", + // Metadata_sortkey_relevance); @@ -79,7 +78,7 @@ void test_relevance_7bit(int argc, char **argv) rec_ape_fish = record_create(nmem, service->num_metadata, service->num_sortkeys); record_add_metadata(nmem, rec_ape_fish, service, "title", data_ape); - record_assign_sortkey(nmem, rec_ape_fish, service, "relevance", data_ape); + //record_assign_sortkey(nmem, rec_ape_fish, service, "relevance", data_ape); record_assign_sortkey(nmem, rec_ape_fish, service, "title", data_ape); record_add_metadata(nmem, rec_ape_fish, service, "title", data_fish); YAZ_CHECK(rec_ape_fish); @@ -89,7 +88,7 @@ void test_relevance_7bit(int argc, char **argv) rec_bee_fish = record_create(nmem, service->num_metadata, service->num_sortkeys); record_add_metadata(nmem, rec_bee_fish, service, "title", data_bee); - record_assign_sortkey(nmem, rec_bee_fish, service, "relevance", data_bee); + //record_assign_sortkey(nmem, rec_bee_fish, service, "relevance", data_bee); record_assign_sortkey(nmem, rec_bee_fish, service, "title", data_bee); record_add_metadata(nmem, rec_bee_fish, service, "title", data_fish); YAZ_CHECK(rec_bee_fish); @@ -99,7 +98,7 @@ void test_relevance_7bit(int argc, char **argv) rec_fish_bee = record_create(nmem, service->num_metadata, service->num_sortkeys); record_add_metadata(nmem, rec_fish_bee, service, "title", data_fish); - record_assign_sortkey(nmem, rec_fish_bee, service, "relevance", data_fish); + //record_assign_sortkey(nmem, rec_fish_bee, service, "relevance", data_fish); record_assign_sortkey(nmem, rec_fish_bee, service, "title", data_fish); record_add_metadata(nmem, rec_fish_bee, service, "title", data_bee); YAZ_CHECK(rec_fish_bee); @@ -109,7 +108,7 @@ void test_relevance_7bit(int argc, char **argv) rec_zebra_bee = record_create(nmem, service->num_metadata, service->num_sortkeys); record_add_metadata(nmem, rec_zebra_bee, service, "title", data_zebra); - record_assign_sortkey(nmem, rec_zebra_bee, service, "relevance", data_zebra); + //record_assign_sortkey(nmem, rec_zebra_bee, service, "relevance", data_zebra); record_assign_sortkey(nmem, rec_zebra_bee, service, "title", data_zebra); record_add_metadata(nmem, rec_zebra_bee, service, "title", data_bee); YAZ_CHECK(rec_zebra_bee); @@ -127,9 +126,9 @@ void test_relevance_7bit(int argc, char **argv) // {"ål", "økologi", "æble", 0}; - struct relevance *rel = 0; - rel = relevance_create(nmem, queryterms, no_recs); - YAZ_CHECK(rel); + //struct relevance *rel = 0; + //rel = relevance_create(nmem, queryterms, no_recs); + //YAZ_CHECK(rel); struct record_cluster *cluster = 0; @@ -139,37 +138,41 @@ void test_relevance_7bit(int argc, char **argv) cluster = reclist_insert(list, service, rec_ape_fish, mk_ape_fish, &no_merged); YAZ_CHECK(cluster); - relevance_newrec(rel, cluster); + data_types_assign(nmem, &cluster->sortkeys[0], *rec_ape_fish->sortkeys[0]); + //relevance_newrec(rel, cluster); cluster = reclist_insert(list, service, rec_bee_fish, mk_bee_fish, &no_merged); YAZ_CHECK(cluster); - relevance_newrec(rel, cluster); + data_types_assign(nmem, &cluster->sortkeys[0], *rec_bee_fish->sortkeys[0]); + //relevance_newrec(rel, cluster); cluster = reclist_insert(list, service, rec_fish_bee, mk_fish_bee, &no_merged); YAZ_CHECK(cluster); - relevance_newrec(rel, cluster); + data_types_assign(nmem, &cluster->sortkeys[0], *rec_fish_bee->sortkeys[0]); + //relevance_newrec(rel, cluster); cluster = reclist_insert(list, service, rec_zebra_bee, mk_zebra_bee, &no_merged); YAZ_CHECK(cluster); - relevance_newrec(rel, cluster); + data_types_assign(nmem, &cluster->sortkeys[0], *rec_zebra_bee->sortkeys[0]); + //relevance_newrec(rel, cluster); YAZ_CHECK(no_recs == no_merged); // now sorting according to sorting criteria, here ascending title struct reclist_sortparms *sort_parms = 0; + reclist_sortparms_insert(nmem, &sort_parms, service, "title", 1); + //reclist_sortparms_insert(nmem, &sort_parms, service, "relevance", 1); // crashes with a fat segmentation fault! To be traced tomorrow - //reclist_sort(list, sort_parms); - + reclist_sort(list, sort_parms); - //mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey); //normalize_mergekey((char *) mergekey_norm, 0); @@ -194,6 +197,7 @@ void test_relevance_7bit(int argc, char **argv) //YAZ_CHECK_EQ(0, 1); } +#endif int main(int argc, char **argv) { @@ -201,7 +205,7 @@ int main(int argc, char **argv) YAZ_CHECK_LOG(); - test_relevance_7bit(argc, argv); + //test_relevance_7bit(argc, argv); YAZ_CHECK_TERM;