Merge pull request #499 from mtmail/travis-ci

[nominatim.git] / nominatim / export.h

diff --git a/nominatim/export.h b/nominatim/export.h
index 7533db2edae51cc76f36f493e892ba86e8ada6f4..c7a302c4d1b520934a38869022c48775ebd16ba1 100644 (file)
--- a/nominatim/export.h
+++ b/nominatim/export.h
@@ -5,11 +5,27 @@
 #include <libxml/xmlwriter.h>
 #include <stdint.h>
 
 #include <libxml/xmlwriter.h>
 #include <stdint.h>
 

+struct export_data
+{   
+    PGresult *          res;
+    PGresult *          resNames;
+    PGresult *          resAddress;
+    PGresult *          resExtraTags;
+};
+

 void nominatim_export(int rank_min, int rank_max, const char *conninfo, const char *structuredoutputfile);
 void nominatim_exportCreatePreparedQueries(PGconn * conn);
 void nominatim_export(int rank_min, int rank_max, const char *conninfo, const char *structuredoutputfile);
 void nominatim_exportCreatePreparedQueries(PGconn * conn);

+

 xmlTextWriterPtr nominatim_exportXMLStart(const char *structuredoutputfile);
 void nominatim_exportXMLEnd(xmlTextWriterPtr writer);
 xmlTextWriterPtr nominatim_exportXMLStart(const char *structuredoutputfile);
 void nominatim_exportXMLEnd(xmlTextWriterPtr writer);

-void nominatim_exportPlace(uint64_t place_id, PGconn * conn, xmlTextWriterPtr writer, pthread_mutex_t * writer_mutex);
+
+void nominatim_exportEndMode(xmlTextWriterPtr writer);
+
+void nominatim_exportPlaceQueries(uint64_t place_id, PGconn * conn, struct export_data * querySet);
+void nominatim_exportFreeQueries(struct export_data * querySet);
+
+void nominatim_exportPlace(uint64_t place_id, PGconn * conn, 
+  xmlTextWriterPtr writer, pthread_mutex_t * writer_mutex, struct export_data * prevQuerySet);

 const char * getRankLabel(int rank);
 
 #endif
 const char * getRankLabel(int rank);
 
 #endif