X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/699f5c42f01a0ec2d4d35818b24bf40fc98cc9b1..e1041151348edf134499e3ba8549dd825dbcead9:/module/nominatim.c diff --git a/module/nominatim.c b/module/nominatim.c index 75238e22..54632f76 100644 --- a/module/nominatim.c +++ b/module/nominatim.c @@ -1,12 +1,22 @@ +/** + * SPDX-License-Identifier: GPL-2.0-only + * + * This file is part of Nominatim. (https://nominatim.org) + * + * Copyright (C) 2022 by the Nominatim developer community. + * For a full list of authors see the git log. + */ #include "postgres.h" #include "fmgr.h" #include "mb/pg_wchar.h" #include -#ifdef PG_MODULE_MAGIC -PG_MODULE_MAGIC; +#if PG_MAJORVERSION_NUM > 15 +#include "varatt.h" #endif +PG_MODULE_MAGIC; + Datum transliteration( PG_FUNCTION_ARGS ); Datum gettokenstring( PG_FUNCTION_ARGS ); void str_replace(char* buffer, int* len, int* changes, char* from, int fromlen, char* to, int tolen, int); @@ -157,17 +167,18 @@ transliteration( PG_FUNCTION_ARGS ) PG_RETURN_TEXT_P(result); } +// Set isspace=1 if the replacement _only_ adds a space before the search string. I.e. to == " " + from void str_replace(char* buffer, int* len, int* changes, char* from, int fromlen, char* to, int tolen, int isspace) { char *p; - // Search string is too long to be pressent + // Search string is too long to be present if (fromlen > *len) return; p = strstr(buffer, from); while(p) { - if (!isspace || *(p-1) != ' ') + if (!isspace || (p > buffer && *(p-1) != ' ')) { (*changes)++; if (tolen != fromlen) memmove(p+tolen, p+fromlen, *len-(p-buffer)+1); @@ -230,7 +241,7 @@ gettokenstring( PG_FUNCTION_ARGS ) sourcedata = (unsigned char *)VARDATA(source); sourcedatalength = VARSIZE(source) - VARHDRSZ; - // Buffer for doing the replace in - string could get slightly longer (double is mastive overkill) + // Buffer for doing the replace in - string could get slightly longer (double is massive overkill) buffer = (char *)palloc((sourcedatalength*2)*sizeof(char)); memcpy(buffer+1, sourcedata, sourcedatalength); buffer[0] = 32;