Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / export.c

diff --git a/nominatim/export.c b/nominatim/export.c
index 9a2f57ad1f383323b887a6df55a1bc5fabd3eab3..467b3c8cb0f51489d98fd8df74714f2480aadafa 100644 (file)
--- a/nominatim/export.c
+++ b/nominatim/export.c
@@ -121,7 +121,7 @@ void nominatim_export(int rank_min, int rank_max, const char *conninfo, const ch
                 PQclear(resPlaces);
                 exit(EXIT_FAILURE);
             }
                 PQclear(resPlaces);
                 exit(EXIT_FAILURE);
             }

-            if (PQftype(resPlaces, 0) != PG_OID_INT4)
+            if (PQftype(resPlaces, 0) != PG_OID_INT8)

             {
                 fprintf(stderr, "Place_id value has unexpected type\n");
                 PQclear(resPlaces);
             {
                 fprintf(stderr, "Place_id value has unexpected type\n");
                 PQclear(resPlaces);


@@ -131,7 +131,7 @@ void nominatim_export(int rank_min, int rank_max, const char *conninfo, const ch
             tuples = PQntuples(resPlaces);
             for (i = 0; i < tuples; i++)
             {
             tuples = PQntuples(resPlaces);
             for (i = 0; i < tuples; i++)
             {

-                nominatim_exportPlace(PGint32(*((uint32_t *)PQgetvalue(resPlaces, i, 0))), conn, writer, NULL, NULL);
+                nominatim_exportPlace(PGint64(*((uint64_t *)PQgetvalue(resPlaces, i, 0))), conn, writer, NULL, NULL);

                 rankTotalDone++;
                 if (rankTotalDone%1000 == 0) printf("Done %i (k)\n", rankTotalDone/1000);
             }
                 rankTotalDone++;
                 if (rankTotalDone%1000 == 0) printf("Done %i (k)\n", rankTotalDone/1000);
             }