diff --git a/cOMS/Application.md b/cOMS/Application.md index 2455b25..d7ce1b2 100644 --- a/cOMS/Application.md +++ b/cOMS/Application.md @@ -1,6 +1,6 @@ ```c++ /** - * Karaka + * Jingga * * @package App * @copyright Dennis Eichhorn @@ -34,42 +34,42 @@ int main(int argc, char **argv) /* --------------- Basic setup --------------- */ const char *arg = Utils::ApplicationUtils::compile_arg_line(argc, argv); - + // Set program path as cwd char *cwd = Utils::ApplicationUtils::cwd(); if (cwd == NULL) { printf("Couldn't get the CWD\n"); - + return -1; } - + char *cwdT = Utils::StringUtils::search_replace(cwd, "\\", "/"); free(cwd); cwd = cwdT; - + Utils::ApplicationUtils::chdir_application(cwd, argv[0]); - + // Check config if (!Utils::FileUtils::file_exists("config.json")) { Controller::ApiController::notInstalled(argc, argv); - + return -1; } - + /* --------------- App setup --------------- */ - + // Load config FILE *in = fopen("config.json", "r"); if (in == NULL) { printf("Couldn't open config.json\n"); - + return -1; } - + app.config = nlohmann::json::parse(in); - + fclose(in); - + // Setup db connection DataStorage::Database::DbConnectionConfig dbdata = { DataStorage::Database::database_type_from_str(app.config["db"]["core"]["masters"]["admin"]["db"].get_ref().c_str()), @@ -79,50 +79,50 @@ int main(int argc, char **argv) app.config["db"]["core"]["masters"]["admin"]["login"].get_ref().c_str(), app.config["db"]["core"]["masters"]["admin"]["password"].get_ref().c_str(), }; - + app.pool = Threads::pool_create(app.config["app"]["threads"]["count"].get()); - + app.db = DataStorage::Database::create_connection(dbdata); app.db->connect(); - + /* --------------- Handle request --------------- */ - + // Handle routes Router::Router router = generate_routes(&app); Router::RouterFunc ptr = Router::match_route(&router, arg); - + // No endpoint found if (ptr == NULL) { ptr = &Controller::ApiController::printHelp; } - + // Dispatch found endpoint (*ptr)(argc, argv); - + /* --------------- Cleanup --------------- */ - + Threads::pool_destroy(app.pool); - + DataStorage::Database::free_MapperData((DataStorage::Database::MapperData *) &Models::ResourceMapper); - + app.db->close(); app.db = NULL; - + Router::free_router(&router); - + free((char *) arg); arg = NULL; - + // Reset CWD (don't know if this is necessary) chdir(cwd); - + free(cwd); } ``` ```c++ /** - * Karaka + * Jingga * * @package Models * @copyright Dennis Eichhorn @@ -146,12 +146,12 @@ Router::Router generate_routes(Application::ApplicationAbstract *app) Controller::ApiController::app = app; Router::Router router = Router::create_router(4); - + Router::set(&router, "^.*?\\-h *.*$", (void *) &Controller::ApiController::printHelp); Router::set(&router, "^.*?\\-v *.*$", (void *) &Controller::ApiController::printVersion); Router::set(&router, "^.*?\\-r *.*$", (void *) &Controller::ApiController::checkResources); Router::set(&router, "^.*?\\-\\-install *.*$", (void *) &Controller::InstallController::installApplication); - + return router; } diff --git a/phpOMS/basics/language_files.md b/phpOMS/basics/language_files.md index 81c2cbc..aa61d84 100644 --- a/phpOMS/basics/language_files.md +++ b/phpOMS/basics/language_files.md @@ -13,7 +13,7 @@ The content of the language files is very simple. All you need is the module nam ```php