Happy new year

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

diff --git a/src/normalize7bit.c b/src/normalize7bit.c
index f6a6d49..29ee8f1 100644 (file)
--- a/src/normalize7bit.c
+++ b/src/normalize7bit.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 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
@@ -21,14 +21,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief char and string normalization for 7bit ascii only
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#if HAVE_CONFIG_H
-#include "cconfig.h"
-#endif
-
 #include "normalize7bit.h"
 
 
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 char * normalize7bit_generic(char * str, const char * rm_chars)
 {
     char *p, *pe;
-    for (p = str; *p && isspace(*p); p++)
+    for (p = str; *p && isspace(*(unsigned char *)p); p++)
         ;
     for (pe = p + strlen(p) - 1;
          pe > p && strchr(rm_chars, *pe); pe--)
@@ -44,38 +44,18 @@ 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(*p))
-            p++;
-        pout = firstword;
-        while (*p && *p != ' ' && pout - firstword < 62)
-            *(pout++) = tolower(*(p++));
-        *(pout++) = ' ';
-        *(pout++) = '\0';
-        if (!strstr(articles, firstword))
-            p = buf;
-        pout = buf;
-    }
-
     while (*p)
     {
-        while (*p && !isalnum(*p))
+        while (*p && !isalnum(*(unsigned char *)p))
             p++;
-        while (isalnum(*p))
-            *(pout++) = tolower(*(p++));
+        while (isalnum(*(unsigned char *)p))
+            *(pout++) = tolower(*(unsigned char *)(p++));
         if (*p)
             *(pout++) = ' ';
-        while (*p && !isalnum(*p))
+        while (*p && !isalnum(*(unsigned char *)p))
             p++;
     }
     if (buf != pout)
@@ -83,7 +63,7 @@ char * normalize7bit_mergekey(char *buf, int skiparticle)
             *(pout--) = '\0';
         }
         while (pout > buf && *pout == ' ');
-    
+
     return buf;
 }
 
@@ -99,10 +79,10 @@ int extract7bit_dates(const char *buf, int *first, int *last, int longdate)
         const char *e;
         int len;
 
-        while (*buf && !isdigit(*buf))
+        while (*buf && !isdigit(*(unsigned char *)buf))
             buf++;
         len = 0;
-        for (e = buf; *e && isdigit(*e); e++)
+        for (e = buf; *e && isdigit(*(unsigned char *)e); e++)
             len++;
         if ((len == 4 && !longdate) || (longdate && len >= 4 && len <= 8))
         {
@@ -124,7 +104,9 @@ int extract7bit_dates(const char *buf, int *first, int *last, int longdate)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+