From f3c9f68da81b358c67ce6fa6b50f2827feb6b4db Mon Sep 17 00:00:00 2001
From: rjawor <rjawor@amu.edu.pl>
Date: Tue, 23 Jul 2019 22:29:32 +0200
Subject: [PATCH] fixes

---
 concordia-server/lemmatizer_facade.cpp | 4 ++--
 concordia-server/lemmatizer_result.hpp | 2 +-
 concordia-server/tm.cpp                | 2 +-
 concordia-server/tm_dao.cpp            | 5 +++--
 concordia-server/tm_dao.hpp            | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/concordia-server/lemmatizer_facade.cpp b/concordia-server/lemmatizer_facade.cpp
index 83141cf..f764494 100644
--- a/concordia-server/lemmatizer_facade.cpp
+++ b/concordia-server/lemmatizer_facade.cpp
@@ -29,8 +29,8 @@ LemmatizerResult LemmatizerFacade::lemmatizeSentence(std::string languageCode, s
 
 }
 
-LemmatizerResult LemmatizerFacade::lemmatizeSentences(std::string languageCode, std::vector<std::string> sentences) {
-    std::vector<std::string> result;
+std::vector<LemmatizerResult> LemmatizerFacade::lemmatizeSentences(std::string languageCode, std::vector<std::string> sentences) {
+    std::vector<LemmatizerResult> result;
     BOOST_FOREACH(std::string & sentence, sentences) {
         result.push_back(lemmatizeSentence(languageCode, sentence));
     }
diff --git a/concordia-server/lemmatizer_result.hpp b/concordia-server/lemmatizer_result.hpp
index 488e363..0784657 100644
--- a/concordia-server/lemmatizer_result.hpp
+++ b/concordia-server/lemmatizer_result.hpp
@@ -1,5 +1,5 @@
 #ifndef LEMMATIZER_RESULT_HDR
-#define LEMMATIZER_RESULT__HDR
+#define LEMMATIZER_RESULT_HDR
 
 #include <string>
 
diff --git a/concordia-server/tm.cpp b/concordia-server/tm.cpp
index b481846..4b48fb1 100644
--- a/concordia-server/tm.cpp
+++ b/concordia-server/tm.cpp
@@ -4,7 +4,7 @@ Tm::Tm(const int id,
    const std::string & name,
    const std::string & sourceLanguageCode,
    const std::string & targetLanguageCode,
-   const in pairedTmId) :
+   const int pairedTmId) :
                _id(id),_name(name),
                _sourceLanguageCode(sourceLanguageCode),
                _targetLanguageCode(targetLanguageCode),
diff --git a/concordia-server/tm_dao.cpp b/concordia-server/tm_dao.cpp
index c19de76..059ec36 100644
--- a/concordia-server/tm_dao.cpp
+++ b/concordia-server/tm_dao.cpp
@@ -36,14 +36,15 @@ std::vector<Tm> TmDAO::getTms() {
     std::vector<Tm> result;
     DBconnection connection;
     connection.startTransaction();
-    std::string query = "select tm.id, tm.name, src_lang.code as src_code, trg_lang.code as trg_code from tm inner join language as src_lang on src_lang.id = tm.source_lang_id inner join language as trg_lang on trg_lang.id = tm.target_lang_id;";
+    std::string query = "select tm.id, tm.name, src_lang.code as src_code, trg_lang.code as trg_code, paired_tm_id from tm inner join language as src_lang on src_lang.id = tm.source_lang_id inner join language as trg_lang on trg_lang.id = tm.target_lang_id;";
     PGresult * dbResult = connection.execute(query);
     for (int i=0;i<connection.getRowCount(dbResult);i++) {
         int id = connection.getIntValue(dbResult, i, 0);
         std::string name = connection.getStringValue(dbResult, i, 1);
         std::string sourceLanguageCode = connection.getStringValue(dbResult, i, 2);
         std::string targetLanguageCode = connection.getStringValue(dbResult, i, 3);
-        result.push_back(Tm(id, name, sourceLanguageCode, targetLanguageCode));
+        int pairedTmId = connection.getIntValue(dbResult, i, 4);
+        result.push_back(Tm(id, name, sourceLanguageCode, targetLanguageCode, pairedTmId));
     }
     connection.clearResult(dbResult);
     connection.endTransaction();
diff --git a/concordia-server/tm_dao.hpp b/concordia-server/tm_dao.hpp
index 238d77d..be39189 100644
--- a/concordia-server/tm_dao.hpp
+++ b/concordia-server/tm_dao.hpp
@@ -28,7 +28,7 @@ public:
 
     std::vector<Tm> getTms();
 
-    std::pair<bool, std::string> getTm(int tmId);
+    Tm getTm(int tmId);
 
 private: