Pazpar2 1.4.4-2 for squeeze

[pazpar2-moved-to-github.git] / src / normalize7bit.c

diff --git a/src/normalize7bit.c b/src/normalize7bit.c
index 1f993c9..83d52ec 100644 (file)
--- a/src/normalize7bit.c
+++ b/src/normalize7bit.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   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
@@ -44,29 +44,9 @@ char * normalize7bit_generic(char * str, const char * rm_chars)
     return p;
 }
 
-
-
-char * normalize7bit_mergekey(char *buf, int skiparticle)
+char *normalize7bit_mergekey(char *buf)
 {
     char *p = buf, *pout = buf;
-
-    if (skiparticle)
-    {
-        char firstword[64];
-        char articles[] = "the den der die des an a "; // must end in space
-
-        while (*p && !isalnum(*(unsigned char *)p))
-            p++;
-        pout = firstword;
-        while (*p && *p != ' ' && pout - firstword < 62)
-            *(pout++) = tolower(*(unsigned char *)(p++));
-        *(pout++) = ' ';
-        *(pout++) = '\0';
-        if (!strstr(articles, firstword))
-            p = buf;
-        pout = buf;
-    }
-
     while (*p)
     {
         while (*p && !isalnum(*(unsigned char *)p))