Patch level :
Files correlati : Ricompilazione Demo : [ ] Commento : Corretta compilazione di relapp git-svn-id: svn://10.65.10.50/trunk@6590 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
4fecfd7f1f
commit
6b07980878
@ -5,6 +5,7 @@
|
|||||||
#include <recarray.h>
|
#include <recarray.h>
|
||||||
#include <relapp.h>
|
#include <relapp.h>
|
||||||
#include <defmask.h>
|
#include <defmask.h>
|
||||||
|
#include <utility.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////
|
||||||
// TRelation_application
|
// TRelation_application
|
||||||
@ -1011,8 +1012,6 @@ void TRelation_application::main_loop()
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
} while (k != K_QUIT);
|
} while (k != K_QUIT);
|
||||||
|
|
||||||
if (_mask->is_open())
|
if (_mask->is_open())
|
||||||
@ -1028,23 +1027,24 @@ void TRelation_application::main_loop()
|
|||||||
msg.send();
|
msg.send();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_transaction.not_empty())
|
if (_curr_transaction.not_empty())
|
||||||
{
|
{
|
||||||
TConfig ini(_ini, "Transaction");
|
TConfig ini(_trans_ini.row(_trans_counter), "Transaction");
|
||||||
int err = NOERR;
|
|
||||||
if (_recins >= 0)
|
if (_recins >= 0)
|
||||||
{
|
{
|
||||||
ini.set("Result", "OK");
|
ini.set("Result", "OK");
|
||||||
|
ini.set("Error", "0");
|
||||||
edit_mask2ini();
|
edit_mask2ini();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
err = get_relation()->status();
|
const int err = get_relation()->status();
|
||||||
ini.set("Result", err == NOERR ? "CANCEL" : "ERROR");
|
ini.set("Result", err == NOERR ? "CANCEL" : "ERROR");
|
||||||
|
ini.set("Error", err);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_trans_counter++;
|
_trans_counter++;
|
||||||
} while ( _trans_counter < _ntransactions);
|
} while ( _trans_counter < _ntransactions);
|
||||||
return k != K_QUIT;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TRelation_application::filter()
|
bool TRelation_application::filter()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user