Merge branch 'master' of github.com:Caesar11/gStore
synchronous between 74 server and local
This commit is contained in:
commit
0094ca38f9
|
@ -2574,9 +2574,8 @@ Database::getFinalResult(SPARQLquery& _sparql_q, ResultSet& _result_set)
|
||||||
for(unsigned i = 0; i < query_vec.size(); i++)
|
for(unsigned i = 0; i < query_vec.size(); i++)
|
||||||
{
|
{
|
||||||
vector<int*>& tmp_vec = query_vec[i]->getResultList();
|
vector<int*>& tmp_vec = query_vec[i]->getResultList();
|
||||||
vector<int*>::iterator itr = tmp_vec.begin();
|
|
||||||
//for every result group in resultlist
|
//for every result group in resultlist
|
||||||
for(; itr != tmp_vec.end(); itr++)
|
for(vector<int*>::reverse_iterator it = tmp_vec.rbegin(); it != tmp_vec.rend(); ++it)
|
||||||
{
|
{
|
||||||
#ifndef STREAM_ON
|
#ifndef STREAM_ON
|
||||||
_result_set.answer[tmp_ans_count] = new string[_var_num];
|
_result_set.answer[tmp_ans_count] = new string[_var_num];
|
||||||
|
@ -2585,9 +2584,9 @@ Database::getFinalResult(SPARQLquery& _sparql_q, ResultSet& _result_set)
|
||||||
printf("getFinalResult:before map loop\n");
|
printf("getFinalResult:before map loop\n");
|
||||||
#endif
|
#endif
|
||||||
//map every ans_id into ans_str
|
//map every ans_id into ans_str
|
||||||
for(int v = 0; v < _var_num; v++)
|
for(int v = _var_num - 1; v >= 0; --v)
|
||||||
{
|
{
|
||||||
int ans_id = (*itr)[v];
|
int ans_id = (*it)[v];
|
||||||
string ans_str;
|
string ans_str;
|
||||||
if (this->objIDIsEntityID(ans_id))
|
if (this->objIDIsEntityID(ans_id))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue