rjawor/concordia-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debug

Browse Source
This commit is contained in:
Rafał Jaworski 2018-08-22 13:30:03 +02:00
parent c6a71ddd00
commit 8e1d2d2c42
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -36,6 +36,7 @@ mgiza-aligner/mgiza/mgizapp/src/mkcls/Makefile
mgiza-aligner/mgiza/mgizapp/src/mkcls/cmake_install.cmake mgiza-aligner/mgiza/mgizapp/src/mkcls/cmake_install.cmake
__pycache__ __pycache__
import-requests/request_handler.log import-requests/request_handler.log
import-requests/request_handler.pid
mgiza-aligner/corpus-compilator/corpora mgiza-aligner/corpus-compilator/corpora
mgiza-aligner/corpus-compilator/dictionaries/*lem mgiza-aligner/corpus-compilator/dictionaries/*lem
mgiza-aligner/corpus-compilator/dictionary-compilator/*.tsv mgiza-aligner/corpus-compilator/dictionary-compilator/*.tsv

2
cat/versions_available/stocznia_plen.cfg
View File

@ -1,5 +1,5 @@
dir@#@stocznia_plen dir@#@stocznia_plen
concordia_host@#@localhost concordia_host@#@concordia.poleng
concordia_port@#@8800 concordia_port@#@8800
tmid@#@2 tmid@#@2
desc@#@Witamy w interaktywnym demo systemu Concordia. System znajduje najdłuższe fragmenty zdania wejściowego w pamięci tłumaczeń. Proszę wpisać polskie zdanie w poniższe pole i nacisnąć Enter (albo użyć przycisku "search"). Aby zapoznać się z systemem możesz użyć wcześniej przygotowanych przykładów - po prostu kliknij link "apply" przy wybranym przykładzie. Po wyszukaniu, kliknij na wybrany podświetlony fragment, aby zobaczyć jego kontekst. desc@#@Witamy w interaktywnym demo systemu Concordia. System znajduje najdłuższe fragmenty zdania wejściowego w pamięci tłumaczeń. Proszę wpisać polskie zdanie w poniższe pole i nacisnąć Enter (albo użyć przycisku "search"). Aby zapoznać się z systemem możesz użyć wcześniej przygotowanych przykładów - po prostu kliknij link "apply" przy wybranym przykładzie. Po wyszukaniu, kliknij na wybrany podświetlony fragment, aby zobaczyć jego kontekst.

2
concordia-server/logger.cpp
View File

@ -67,7 +67,7 @@ void Logger::logConcordiaSearchResult(const ConcordiaSearchResult & result) {
void Logger::_initialize(log4cpp::Category & root) { void Logger::_initialize(log4cpp::Category & root) {
log4cpp::Appender *appender = new log4cpp::FileAppender("default", LOG_FILE_PATH); log4cpp::Appender *appender = new log4cpp::FileAppender("default", LOG_FILE_PATH);
log4cpp::PatternLayout *layout = new log4cpp::PatternLayout(); log4cpp::PatternLayout *layout = new log4cpp::PatternLayout();
layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S}%c %x: %m%n"); layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}%c %x: %m%n");
appender->setLayout(layout); appender->setLayout(layout);
root.setPriority(log4cpp::Priority::INFO); root.setPriority(log4cpp::Priority::INFO);

5
concordia-server/searcher_controller.cpp
View File

@ -128,13 +128,18 @@ void SearcherController::concordiaPhraseSearch(rapidjson::Writer<rapidjson::Stri
void SearcherController::concordiaSearch(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter, void SearcherController::concordiaSearch(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter,
std::string & pattern, std::string & pattern,
const int tmId) { const int tmId) {
Logger::log("concordia search");
boost::ptr_map<int,Concordia>::iterator it = _concordiasMap->find(tmId); boost::ptr_map<int,Concordia>::iterator it = _concordiasMap->find(tmId);
if (it != _concordiasMap->end()) { if (it != _concordiasMap->end()) {
TokenizedSentence originalPattern = it->second->tokenize(pattern, false, false); TokenizedSentence originalPattern = it->second->tokenize(pattern, false, false);
std::string lemmatizedPattern = std::string lemmatizedPattern =
_lemmatizerFacade->lemmatizeIfNeeded(originalPattern.getTokenizedSentence(), tmId); _lemmatizerFacade->lemmatizeIfNeeded(originalPattern.getTokenizedSentence(), tmId);
boost::shared_ptr<ConcordiaSearchResult> rawConcordiaResult = it->second->concordiaSearch(lemmatizedPattern, true); boost::shared_ptr<ConcordiaSearchResult> rawConcordiaResult = it->second->concordiaSearch(lemmatizedPattern, true);
Logger::log("got raw concordia result");
CompleteConcordiaSearchResult result = _unitDAO.getConcordiaResult(rawConcordiaResult, originalPattern); CompleteConcordiaSearchResult result = _unitDAO.getConcordiaResult(rawConcordiaResult, originalPattern);
Logger::log("got db result");
jsonWriter.StartObject(); jsonWriter.StartObject();
jsonWriter.String("status"); jsonWriter.String("status");

3
concordia-server/unit_dao.cpp
View File

@ -92,6 +92,7 @@ SimpleSearchResult UnitDAO::_getResultFromFragment(
const MatchedPatternFragment & fragment, const MatchedPatternFragment & fragment,
const TokenizedSentence & tokenizedPattern) { const TokenizedSentence & tokenizedPattern) {
Logger::log("_getResultFromFragment");
DBconnection connection; DBconnection connection;
connection.startTransaction(); connection.startTransaction();
@ -112,6 +113,7 @@ SimpleSearchResult UnitDAO::_getResultFromFragment(
params.push_back(new IntParam(2*(sOccurence.getOffset()+fragment.getMatchedLength()))); params.push_back(new IntParam(2*(sOccurence.getOffset()+fragment.getMatchedLength())));
params.push_back(new IntParam(sOccurence.getId())); params.push_back(new IntParam(sOccurence.getId()));
PGresult * result = connection.execute(query, params); PGresult * result = connection.execute(query, params);
Logger::log("got examples");
ExampleOccurence occurence(connection.getIntValue(result,0,0), // example id ExampleOccurence occurence(connection.getIntValue(result,0,0), // example id
connection.getIntValue(result,0,3), // matched example start connection.getIntValue(result,0,3), // matched example start
connection.getIntValue(result,0,4), // matched example end connection.getIntValue(result,0,4), // matched example end
@ -129,6 +131,7 @@ SimpleSearchResult UnitDAO::_getResultFromFragment(
targetParams.push_back(new IntParam(sOccurence.getOffset())); targetParams.push_back(new IntParam(sOccurence.getOffset()));
targetParams.push_back(new IntParam(sOccurence.getOffset() + fragment.getMatchedLength() - 1)); targetParams.push_back(new IntParam(sOccurence.getOffset() + fragment.getMatchedLength() - 1));
PGresult * targetResult = connection.execute(targetQuery, targetParams); PGresult * targetResult = connection.execute(targetQuery, targetParams);
Logger::log("got target fragments");
int prevPos = -2; int prevPos = -2;
int currStart = -1; int currStart = -1;

6
tests/addLemmatizedTM.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
CORPUS_NAME="logofag_enpl" CORPUS_NAME="stocznia_plen"
SRC_LANG_ID=2 SRC_LANG_ID=1
TRG_LANG_ID=1 TRG_LANG_ID=2
./addAlignedLemmatizedTM.py $CORPUS_NAME ../mgiza-aligner/corpora/$CORPUS_NAME/src_final.txt $SRC_LANG_ID ../mgiza-aligner/corpora/$CORPUS_NAME/trg_final.txt $TRG_LANG_ID ../mgiza-aligner/corpora/$CORPUS_NAME/aligned_final.txt ./addAlignedLemmatizedTM.py $CORPUS_NAME ../mgiza-aligner/corpora/$CORPUS_NAME/src_final.txt $SRC_LANG_ID ../mgiza-aligner/corpora/$CORPUS_NAME/trg_final.txt $TRG_LANG_ID ../mgiza-aligner/corpora/$CORPUS_NAME/aligned_final.txt