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

Merge branch 'master' of rjawor.vm.wmi.amu.edu.pl:concordia-server

Browse Source
This commit is contained in:
Rafał Jaworski 2017-10-10 17:27:46 +02:00
commit a2b6853dcf
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
concordia-server/json_generator.cpp
View File

@ -59,3 +59,19 @@ void JsonGenerator::writeSimpleSearchResult(rapidjson::Writer<rapidjson::StringB
jsonWriter.EndObject(); //simple search result jsonWriter.EndObject(); //simple search result
} }
void JsonGenerator::writeLexiconSearchResult(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter,
const SimpleSearchResult & result) {
jsonWriter.StartArray();
BOOST_FOREACH(ExampleOccurence occurence, result.getOccurences()) {
jsonWriter.StartObject();
jsonWriter.String("sourceSegment");
jsonWriter.String(occurence.getSourceSegment().c_str());
jsonWriter.String("targetSegment");
jsonWriter.String(occurence.getTargetSegment().c_str());
jsonWriter.EndObject(); // occurence
}
jsonWriter.EndArray(); //simple search result
}

4
concordia-server/json_generator.hpp
View File

@ -22,6 +22,10 @@ public:
static void writeSimpleSearchResult(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter, static void writeSimpleSearchResult(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter,
const SimpleSearchResult & result); const SimpleSearchResult & result);
static void writeLexiconSearchResult(rapidjson::Writer<rapidjson::StringBuffer> & jsonWriter,
const SimpleSearchResult & result);
private: private:
}; };

2
concordia-server/searcher_controller.cpp
View File

@ -52,7 +52,7 @@ void SearcherController::lexiconSearch(rapidjson::Writer<rapidjson::StringBuffer
jsonWriter.String("status"); jsonWriter.String("status");
jsonWriter.String("success"); jsonWriter.String("success");
jsonWriter.String("result"); jsonWriter.String("result");
JsonGenerator::writeSimpleSearchResult(jsonWriter, result); JsonGenerator::writeLexiconSearchResult(jsonWriter, result);
jsonWriter.EndObject(); jsonWriter.EndObject();
} else { } else {
JsonGenerator::signalError(jsonWriter, "no such tm!"); JsonGenerator::signalError(jsonWriter, "no such tm!");