diff options
author | Lars Bisballe Jensen <larsbisballe@gmail.com> | 2011-10-14 10:42:27 +0200 |
---|---|---|
committer | Lars Bisballe Jensen <larsbisballe@gmail.com> | 2011-10-14 10:42:27 +0200 |
commit | 2e574b6dfcb824239079a485527d420497b27b01 (patch) | |
tree | f49be56d98f0e952461b856d41eb54218b5f135b /client/luapraxisd.cc | |
parent | 2d5f72a787426b59658d1b66cfe0ea602ea66b61 (diff) | |
parent | d602bdeb65d0e4007a8a02e5c6d4b9b271287aa9 (diff) |
Merge branch 'master' of http://git.aasimon.org/public/pracro
Diffstat (limited to 'client/luapraxisd.cc')
-rw-r--r-- | client/luapraxisd.cc | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/client/luapraxisd.cc b/client/luapraxisd.cc index 1d9da4c..0696674 100644 --- a/client/luapraxisd.cc +++ b/client/luapraxisd.cc @@ -27,9 +27,7 @@ */ #include "luapraxisd.h" -#ifdef WITH_PRAXISD - -#include "../server/src/praxisd.h" +#include "praxisd.h" #include <lauxlib.h> #include <strings.h> @@ -40,7 +38,7 @@ (lua_isboolean(L,i) ? lua_toboolean(L,i) : luaL_checkint(L,i)) typedef struct px_userdata { - Praxisd *px; + PraxisdSync *px; } px_userdata; static int px_getcave(lua_State *L) @@ -53,14 +51,14 @@ static int px_getcave(lua_State *L) QVector<QString> cavelist; - Praxisd::patient_t patient = pxu->px->patient_get_by_cpr(cpr); - std::vector<Praxisd::sogeord_t>::iterator i = patient.sogeord.begin(); + Patient patient = pxu->px->patient_get_by_cpr(cpr); + QVector<sogeord_t>::iterator i = patient.sogeord.begin(); while(i != patient.sogeord.end()) { - std::string cavesogeord = i->sogenr.substr(1, i->sogenr.size() - 1); - std::vector<Praxisd::cave_t> cave = pxu->px->diverse_get_cave(cavesogeord); + QString cavesogeord = i->sogenr;//.mid(1, i->sogenr.size() - 1); + QVector<cave_t> cave = pxu->px->diverse_get_cave(cavesogeord); if(cave.size() == 1) { - if(cave[0].cave != "ANDET") cavelist.push_back(cave[0].cave.c_str()); - else cavelist.push_back(i->sogetxt.c_str()); + if(cave[0].cave != "ANDET") cavelist.push_back(cave[0].cave); + else cavelist.push_back(i->sogetxt); } i++; } @@ -82,13 +80,13 @@ static int px_cavelist(lua_State *L) pxu = (px_userdata *)luaL_checkudata(L, 1, "Praxisd"); luaL_argcheck(L, pxu, 1, "Praxisd expected"); - std::vector<Praxisd::cave_t> cavelist = pxu->px->diverse_get_cave(""); + QVector<cave_t> cavelist = pxu->px->diverse_get_cave(""); lua_createtable(L, 0, cavelist.size()); int top = lua_gettop(L); - for(size_t i = 0; i < cavelist.size(); i++) { - lua_pushstring(L, QString::fromUtf8(cavelist[i].cave.c_str()).toStdString().c_str()); + for(size_t i = 0; i < (size_t)cavelist.size(); i++) { + lua_pushstring(L, QString::fromUtf8(cavelist[i].cave.toStdString().c_str()).toStdString().c_str()); lua_rawseti(L, top, i); } @@ -106,7 +104,7 @@ static int px_new(lua_State *L) luaL_getmetatable(L, "Praxisd"); lua_setmetatable(L, -2); - pxu->px = new Praxisd(host, port); + pxu->px = new PraxisdSync(host, port); return 1; } @@ -144,9 +142,3 @@ void register_praxisd(lua_State *L) luaL_register(L, NULL, px_meths); luaL_openlib (L, "Praxisd", px_funcs, 0); } - -#else/*WITH_PRAXISD*/ - -void register_praxisd(lua_State *L){} - -#endif/*WITH_PRAXISD*/ |