Merge pull request #316 from Woazboat/build_system_cleanup

Build system/include cleanup + some more tests
zerebubuth · Nov 28, 2023 · 63a06e4 · 63a06e4
2 parents d2d6114 + b4677c6
commit 63a06e4
Show file tree

Hide file tree

Showing 20 changed files with 134 additions and 81 deletions.
diff --git a/include/cgimap/backend/apidb/common_pgsql_selection.hpp b/include/cgimap/backend/apidb/common_pgsql_selection.hpp
@@ -39,4 +39,8 @@ void extract_changesets(
   const std::chrono::system_clock::time_point &now,
   bool include_changeset_discussions);
 
+// parses psql array based on specs given
+// https://www.postgresql.org/docs/current/static/arrays.html#ARRAYS-IO
+std::vector<std::string> psql_array_to_vector(std::string str);
+
 #endif /* CGIMAP_BACKEND_APIDB_COMMON_PGSQL_SELECTION_HPP */
diff --git a/include/cgimap/data_selection.hpp b/include/cgimap/data_selection.hpp
@@ -3,13 +3,14 @@
 
 #include "cgimap/types.hpp"
 #include "cgimap/output_formatter.hpp"
-#include "cgimap/backend/apidb/transaction_manager.hpp"
 
 #include <chrono>
 #include <memory>
 #include <sstream>
 #include <vector>
 
+class Transaction_Owner_Base;
+
 /**
  * represents a selected set of data which can be written out to
  * an output_formatter and manipulated by a nice set of commands
@@ -192,9 +193,4 @@ class data_selection {
   };
 };
 
-
-// parses psql array based on specs given
-// https://www.postgresql.org/docs/current/static/arrays.html#ARRAYS-IO
-std::vector<std::string> psql_array_to_vector(std::string str);
-
 #endif /* DATA_SELECTION_HPP */
diff --git a/include/cgimap/mime_types.hpp b/include/cgimap/mime_types.hpp
@@ -12,7 +12,7 @@ enum type {
   unspecified_type, // a "null" type, used to indicate no choice.
   text_plain,
   application_xml,
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
   application_json,
 #endif
   any_type // the "*/*" type used to mean that anything is acceptable.

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -173,7 +173,6 @@ libcgimap_core_la_SOURCES=\
 	backend.cpp \
 	bbox.cpp \
 	choose_formatter.cpp \
-	data_selection.cpp \
 	handler.cpp \
 	http.cpp \
 	logger.cpp \

diff --git a/src/backend/apidb/changeset.cpp b/src/backend/apidb/changeset.cpp
@@ -1,5 +1,5 @@
 
-#include "backend/apidb/pqxx_string_traits.hpp"
+#include "cgimap/backend/apidb/pqxx_string_traits.hpp"
 #include "cgimap/backend/apidb/changeset.hpp"
 #include "cgimap/logger.hpp"
 #include "cgimap/http.hpp"

diff --git a/src/backend/apidb/changeset_upload/node_updater.cpp b/src/backend/apidb/changeset_upload/node_updater.cpp
@@ -1,6 +1,3 @@
-
-#include "util.hpp"
-
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 #include "cgimap/backend/apidb/changeset_upload/node_updater.hpp"
 #include "cgimap/backend/apidb/pqxx_string_traits.hpp"
@@ -9,6 +6,7 @@
 #include "cgimap/http.hpp"
 #include "cgimap/logger.hpp"
 #include "cgimap/options.hpp"
+#include "cgimap/util.hpp"
 
 
 #include <algorithm>

diff --git a/src/backend/apidb/changeset_upload/relation_updater.cpp b/src/backend/apidb/changeset_upload/relation_updater.cpp
@@ -1,11 +1,10 @@
-#include "util.hpp"
-
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 #include "cgimap/backend/apidb/changeset_upload/relation_updater.hpp"
 #include "cgimap/backend/apidb/pqxx_string_traits.hpp"
 #include "cgimap/backend/apidb/utils.hpp"
 #include "cgimap/http.hpp"
 #include "cgimap/logger.hpp"
+#include "cgimap/util.hpp"
 
 #include <algorithm>
 #include <iterator>

diff --git a/src/backend/apidb/changeset_upload/way_updater.cpp b/src/backend/apidb/changeset_upload/way_updater.cpp
@@ -1,12 +1,11 @@
-#include "util.hpp"
-
 #include "cgimap/api06/changeset_upload/osmchange_tracking.hpp"
 #include "cgimap/backend/apidb/changeset_upload/way_updater.hpp"
 #include "cgimap/backend/apidb/pqxx_string_traits.hpp"
 #include "cgimap/backend/apidb/utils.hpp"
 #include "cgimap/http.hpp"
 #include "cgimap/logger.hpp"
 #include "cgimap/options.hpp"
+#include "cgimap/util.hpp"
 
 #include <algorithm>
 #include <cassert>

diff --git a/src/backend/apidb/common_pgsql_selection.cpp b/src/backend/apidb/common_pgsql_selection.cpp
@@ -273,3 +273,56 @@ void extract_changesets(
       elem, tags, include_changeset_discussions, comments, now);
   }
 }
+
+std::vector<std::string> psql_array_to_vector(std::string str) {
+  std::vector<std::string> strs;
+  std::ostringstream value;
+  bool quotedValue = false;
+  bool escaped = false;
+  bool write = false;
+
+  if (str == "{NULL}" || str == "")
+    return strs;
+
+  for (unsigned int i=1; i<str.size(); i++) {
+    if (str[i]==',') {
+      if (quotedValue) {
+        value<<",";
+      } else {
+        write = true;
+      }
+    } else if (str[i]=='\"') {
+      if (escaped) {
+        value << "\"";
+        escaped = false;
+      } else if (quotedValue) {
+        quotedValue=false;
+      } else {
+        quotedValue = true;
+      }
+    } else if (str[i]=='\\'){
+      if (escaped) {
+        value << "\\";
+        escaped = false;
+      } else {
+        escaped = true;
+      }
+    } else if (str[i]=='}') {
+      if(quotedValue){
+        value << "}";
+      } else {
+        write = true;
+      }
+    } else {
+      value<<str[i];
+    }
+
+    if (write) {
+      strs.push_back(value.str());
+      value.str("");
+      value.clear();
+      write=false;
+    }
+  }
+  return strs;
+}
diff --git a/src/choose_formatter.cpp b/src/choose_formatter.cpp
@@ -6,8 +6,10 @@
 #include "cgimap/request_helpers.hpp"
 #include "cgimap/xml_writer.hpp"
 #include "cgimap/xml_formatter.hpp"
+#if HAVE_YAJL
 #include "cgimap/json_writer.hpp"
 #include "cgimap/json_formatter.hpp"
+#endif
 #include "cgimap/text_writer.hpp"
 #include "cgimap/text_formatter.hpp"
 #include "cgimap/logger.hpp"
@@ -115,7 +117,7 @@ struct http_accept_grammar
       = lit("* / *")      [_val = mime::any_type]
       | lit("text/xml") [_val = mime::application_xml]
       | lit("application/xml") [_val = mime::application_xml]
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
       | lit("application/json")[_val = mime::application_json]
 #endif
       ;
@@ -256,7 +258,7 @@ std::unique_ptr<output_formatter> create_formatter(mime::type best_type, output_
     case mime::application_xml:
       return std::make_unique<xml_formatter>(std::make_unique<xml_writer>(out, true));
 
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
     case mime::application_json:
       return std::make_unique<json_formatter>(std::make_unique<json_writer>(out, false));
 #endif

diff --git a/src/data_selection.cpp b/src/data_selection.cpp
diff --git a/src/json_writer.cpp b/src/json_writer.cpp
@@ -12,7 +12,7 @@ struct json_writer::pimpl_ {
   // so seems best to be on the safe side.
   yajl_gen gen;
 
-#ifdef HAVE_YAJL2
+#if HAVE_YAJL2
   yajl_alloc_funcs alloc_funcs;
 #else
   yajl_gen_config config;
@@ -36,7 +36,7 @@ static void wrap_write(void *context, const char *str, unsigned int len) {
 
 json_writer::json_writer(output_buffer &out, bool indent)
     : pimpl(std::make_unique<pimpl_>()), out(out) {
-#ifdef HAVE_YAJL2
+#if HAVE_YAJL2
   pimpl->gen = yajl_gen_alloc(NULL);
 
 #else  /* older version of YAJL */
@@ -56,7 +56,7 @@ json_writer::json_writer(output_buffer &out, bool indent)
     throw std::runtime_error("error creating json writer.");
   }
 
-#ifdef HAVE_YAJL2
+#if HAVE_YAJL2
   if (indent) {
     yajl_gen_config(pimpl->gen, yajl_gen_beautify, 1);
     yajl_gen_config(pimpl->gen, yajl_gen_indent_string, " ");

diff --git a/src/logger.cpp b/src/logger.cpp
@@ -3,7 +3,8 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
- #include <unistd.h>
+#include <unistd.h>
+#include <memory>
 
 #include "cgimap/logger.hpp"
 #include <fmt/core.h>

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,4 +1,6 @@
+#if ENABLE_APIDB
 #include <pqxx/pqxx>
+#endif
 #include <iostream>
 #include <sstream>
 
@@ -395,6 +397,8 @@ int main(int argc, char **argv) {
   } catch (const po::error & e) {
     std::cerr << "Error: " << e.what() << "\n(\"openstreetmap-cgimap --help\" for help)" << std::endl;
     return 1;
+
+#if ENABLE_APIDB
   } catch (const pqxx::sql_error &er) {
     // Catch-all for query related postgres exceptions
     std::cerr << "Error: " << er.what() << std::endl
@@ -408,6 +412,7 @@ int main(int argc, char **argv) {
     std::cerr << "Error: " << e.base().what() << std::endl;
     return 1;
 
+#endif
 #endif
 
   } catch (const std::exception &e) {

diff --git a/src/mime_types.cpp b/src/mime_types.cpp
@@ -13,7 +13,7 @@ string to_string(type t) {
     return "text/plain";
   } else if (application_xml == t) {
     return "application/xml";
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
   } else if (application_json == t) {
     return "application/json";
 #endif
@@ -37,7 +37,7 @@ type parse_from(const std::string &name) {
     t = application_xml;
   } else if (name == "application/xml") {
     t = application_xml;
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
   } else if (name == "application/json") {
     t = application_json;
 #endif

diff --git a/src/osm_responder.cpp b/src/osm_responder.cpp
@@ -11,7 +11,7 @@ osm_responder::~osm_responder() = default;
 list<mime::type> osm_responder::types_available() const {
   list<mime::type> types;
   types.push_back(mime::application_xml);
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
   types.push_back(mime::application_json);
 #endif
   return types;

diff --git a/src/routes.cpp b/src/routes.cpp
@@ -279,7 +279,7 @@ namespace {
  */
   pair<string, mime::type> resource_mime_type(const string &path) {
 
-#ifdef HAVE_YAJL
+#if HAVE_YAJL
     {
       std::size_t json_found = path.rfind(".json");
 

diff --git a/test/test_apidb_backend_nodes.cpp b/test/test_apidb_backend_nodes.cpp
@@ -13,6 +13,7 @@
 #include "cgimap/routes.hpp"
 #include "cgimap/process_request.hpp"
 #include "cgimap/backend/apidb/utils.hpp"
+#include "cgimap/backend/apidb/common_pgsql_selection.hpp"
 
 #include "test_formatter.hpp"
 #include "test_database.hpp"

diff --git a/test/test_apidb_backend_oauth.cpp b/test/test_apidb_backend_oauth.cpp
@@ -5,6 +5,7 @@
 
 #include <sys/time.h>
 #include <cstdio>
+#include <memory>
 
 #include "cgimap/config.hpp"
 #include "cgimap/time.hpp"