X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/b3f2bdb822bc02d44ee4711591b1089ee0ff909a..71ae7f10f74251ebef13abe8d186276e6255b5d4:/nominatim/import.c diff --git a/nominatim/import.c b/nominatim/import.c index 1f889bf6..419ab6a5 100644 --- a/nominatim/import.c +++ b/nominatim/import.c @@ -74,6 +74,8 @@ xmlHashTablePtr partionTableTagsHashDelete; char featureNameString[MAX_FEATURENAMESTRING]; char featureExtraTagString[MAX_FEATUREEXTRATAGSTRING]; +extern int verbose; + void StartElement(xmlTextReaderPtr reader, const xmlChar *name) { char * value; @@ -367,6 +369,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) if (fileMode == FILEMODE_UPDATE || fileMode == FILEMODE_DELETE || fileMode == FILEMODE_ADD) { paramValues[0] = (const char *)place_id; + if (verbose) fprintf(stderr, "placex_delete: %s\n", paramValues[0]); res = PQexecPrepared(conn, "placex_delete", 1, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -376,6 +379,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) } PQclear(res); + if (verbose) fprintf(stderr, "search_name_delete: %s\n", paramValues[0]); res = PQexecPrepared(conn, "search_name_delete", 1, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -385,6 +389,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) } PQclear(res); + if (verbose) fprintf(stderr, "place_addressline_delete: %s\n", paramValues[0]); res = PQexecPrepared(conn, "place_addressline_delete", 1, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -441,6 +446,9 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) strcpy(featureNameString+namePos, (char *) featureName[i].value); namePos += lineValueLen; strcpy(featureNameString+(namePos++), "\""); + + xmlFree(featureName[i].type); + xmlFree(featureName[i].value); } } paramValues[5] = (const char *)featureNameString; @@ -471,11 +479,14 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) strcpy(featureExtraTagString+namePos, (char *) featureExtraTag[i].value); namePos += lineValueLen; strcpy(featureExtraTagString+(namePos++), "\""); + + xmlFree(featureExtraTag[i].type); + xmlFree(featureExtraTag[i].value); } } paramValues[7] = (const char *)featureExtraTagString; - if (strlen(feature.parentPlaceID) == 0) + if (xmlStrlen(feature.parentPlaceID) == 0) paramValues[8] = "0"; else paramValues[8] = (const char *)feature.parentPlaceID; @@ -487,6 +498,7 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) paramValues[13] = (const char *)feature.geometry; if (strlen(paramValues[3]) && strlen(paramValues[13])) { + if (verbose) fprintf(stderr, "placex_insert: %s\n", paramValues[0]); res = PQexecPrepared(conn, "placex_insert", 14, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -503,15 +515,18 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) // insert into place_address paramValues[0] = (const char *)place_id; paramValues[1] = (const char *)featureAddress[i].distance; + if (paramValues[1] == NULL || strlen(paramValues[1]) == 0) paramValues[1] = "0"; paramValues[2] = (const char *)featureAddress[i].type; paramValues[3] = (const char *)featureAddress[i].id; paramValues[4] = (const char *)featureAddress[i].key; paramValues[5] = (const char *)featureAddress[i].value; paramValues[6] = (const char *)featureAddress[i].isAddress; + if (verbose) fprintf(stderr, "placex_insert: %s %s\n", paramValues[2], paramValues[3]); res = PQexecPrepared(conn, "place_addressline_insert", 7, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { fprintf(stderr, "place_addressline_insert: INSERT failed: %s", PQerrorMessage(conn)); + fprintf(stderr, "(%s,%s,%s,%s,%s,%s,%s)",paramValues[0],paramValues[1],paramValues[2],paramValues[3],paramValues[4],paramValues[5],paramValues[6]); PQclear(res); exit(EXIT_FAILURE); } @@ -526,10 +541,11 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) if (featureNameLines) { - if (strlen(feature.parentPlaceID) > 0 && featureAddressLines == 0) + if (xmlStrlen(feature.parentPlaceID) > 0 && featureAddressLines == 0) { paramValues[0] = (const char *)place_id; - paramValues[1] = feature.parentPlaceID; + paramValues[1] = (const char *)feature.parentPlaceID; + if (verbose) fprintf(stderr, "search_name_from_parent_insert: INSERT %s %s\n", paramValues[0], paramValues[1]); res = PQexecPrepared(conn, "search_name_from_parent_insert", 2, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -537,11 +553,12 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) PQclear(res); exit(EXIT_FAILURE); } - PQclear(res); + PQclear(res); } else { paramValues[0] = (const char *)place_id; + if (verbose) fprintf(stderr, "search_name_insert: INSERT %s\n", paramValues[0]); res = PQexecPrepared(conn, "search_name_insert", 1, paramValues, NULL, NULL, 0); if (PQresultStatus(res) != PGRES_COMMAND_OK) { @@ -589,11 +606,11 @@ void EndElement(xmlTextReaderPtr reader, const xmlChar *name) xmlFree(feature.value); xmlFree(feature.rankAddress); xmlFree(feature.rankSearch); + if (feature.countryCode) xmlFree(feature.countryCode); if (feature.parentPlaceID) xmlFree(feature.parentPlaceID); if (feature.parentType) xmlFree(feature.parentType); if (feature.parentID) xmlFree(feature.parentID); // if (feature.name) xmlFree(feature.name); - if (feature.countryCode) xmlFree(feature.countryCode); if (feature.adminLevel) xmlFree(feature.adminLevel); if (feature.houseNumber) xmlFree(feature.houseNumber); if (feature.geometry) xmlFree(feature.geometry); @@ -747,10 +764,12 @@ int nominatim_import(const char *conninfo, const char *partionTagsFilename, cons res = PQprepare(conn, "search_name_insert", "insert into search_name (place_id, search_rank, address_rank, country_code, name_vector, nameaddress_vector, centroid) " "select place_id, rank_search, rank_address, country_code, make_keywords(name), " - "(select uniq(sort(array_agg(parent_search_name.name_vector))) from place_addressline join search_name as parent_search_name on " - "(address_place_id = parent_search_name.place_id) where place_addressline.place_id = $1 ), st_centroid(geometry) from placex " + "(select uniq(sort(array_agg(parent_search_name.name_vector))) from search_name as parent_search_name where place_id in " + "(select distinct address_place_id from place_addressline where place_addressline.place_id = $1 limit 1000)" + "), st_centroid(geometry) from placex " "where place_id = $1", 1, NULL); + if (PQresultStatus(res) != PGRES_COMMAND_OK) { fprintf(stderr, "Failed to prepare search_name_insert: %s\n", PQerrorMessage(conn));