X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_normalize.c;h=8cd2b2a1a3c935cc0be9282933f1c3f952e033cd;hb=3d39722ae64c21a6d5833ec667ef9fd2fb66913f;hp=b92c8e93a4ac700743415e09d03fa2d228945c82;hpb=1f2d494505138bfbc6bbff8fcddeb786144a183c;p=pazpar2-moved-to-github.git

diff --git a/src/test_normalize.c b/src/test_normalize.c
index b92c8e9..8cd2b2a 100644
--- a/src/test_normalize.c
+++ b/src/test_normalize.c
@@ -1,7 +1,5 @@
-/* $Id: test_normalize.c,v 1.1 2007-09-07 10:46:33 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2010 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 <config.h>
 #endif
 
 #include <string.h>
@@ -41,13 +39,13 @@ int test_normalize7bit_generic(const char *rm_chars, const char *input,
     return ret;
 }
 
-int test_normalize7bit_mergekey(int skiparticle, const char *input,
+int test_normalize7bit_mergekey(const char *input,
                                 const char *expect_output)
 {
     int ret = 0;
 
     char *tmp = xstrdup(input);
-    char *output = normalize7bit_mergekey(tmp, skiparticle);
+    char *output = normalize7bit_mergekey(tmp);
     if (!strcmp(expect_output, output))
         ret = 1;
     xfree(tmp);
@@ -64,10 +62,8 @@ int main(int argc, char **argv)
  
     YAZ_CHECK(test_normalize7bit_generic("/; "," ", ""));
 
-    YAZ_CHECK(test_normalize7bit_mergekey(0, "the art of computer", "the art of computer"));
-    YAZ_CHECK(test_normalize7bit_mergekey(1, "the art of computer", "art of computer"));
-
-    YAZ_CHECK(test_normalize7bit_mergekey(1, "The Art Of Computer", "art of computer"));
+    YAZ_CHECK(test_normalize7bit_mergekey("the art of computer", "the art of computer"));
+    YAZ_CHECK(test_normalize7bit_mergekey("The Art Of Computer", "the art of computer"));
    
     YAZ_CHECK_TERM;
 }
@@ -78,7 +74,9 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+