X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=afb4e3c160fc8fe624e45474339c741ebdd3900f;hb=d0a576c466b4aad3cc044a459c4e36f719738ec5;hp=f9785a830b87cebe4021c90c1e8cfb30d861d85a;hpb=2058959fc0a6888b55f23586cd3f1d173b2a46b5;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index f9785a8..afb4e3c 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,7 +1,5 @@ -/* $Id: reclists.c,v 1.22 2007-08-28 21:11:21 quinn Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2009 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,15 +12,15 @@ 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 + +*/ #include #if HAVE_CONFIG_H -#include +#include #endif #include @@ -176,14 +174,14 @@ static int reclist_cmp(const void *p1, const void *p2) union data_types *ut2 = r2->sortkeys[s->offset]; switch (s->type) { - char *s1, *s2; + const char *s1, *s2; case Metadata_sortkey_relevance: res = r2->relevance - r1->relevance; break; case Metadata_sortkey_string: - s1 = ut1 ? ut1->text : ""; - s2 = ut2 ? ut2->text : ""; + s1 = ut1 ? ut1->text.sort : ""; + s2 = ut2 ? ut2->text.sort : ""; res = strcmp(s2, s1); if (res) { @@ -342,7 +340,9 @@ struct record_cluster *reclist_insert( struct reclist *l, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +