root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corretto il parsing dei Join per asdeguarlo al nuovo metodo di

Browse Source 
valutazione delle espressioni filtro dei cursori
	ATTENZIONE! ora nelle maschere è OBBLIGATORIO mettere
	i Join dopo la use


git-svn-id: svn://10.65.10.50/trunk@5529 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
augusto 1997-11-04 11:20:13 +00:00
parent 0130f729ff
commit b2d7915d77
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/maskfld.cpp
View File

@ -2642,7 +2642,7 @@ bool TEdit_field::parse_item(TScanner& scanner)
} }
else scanner.push(); else scanner.push();
const char* filter = ""; TString filter = "";
if (scanner.popkey() == "SE") if (scanner.popkey() == "SE")
filter = (const char*)scanner.line(); filter = (const char*)scanner.line();
else else
@ -2650,7 +2650,21 @@ bool TEdit_field::parse_item(TScanner& scanner)
if (r != NULL) if (r != NULL)
{ {
_browse = new TBrowse(this, r, key, filter); _browse = new TBrowse(this, r, key, ""); // create browse with no filter ...
// ... complete relation by parsing all Join items ...
while (scanner.popkey() == "JO")
{
if (browse())
browse()->parse_join(scanner);
else
scanner.line();
}
scanner.push();
if (filter.not_empty())
browse()->cursor()->setfilter(filter); // ... then set filter to cursor
if (tabmaskname.not_empty()) if (tabmaskname.not_empty())
{ {
@ -2687,15 +2701,6 @@ bool TEdit_field::parse_item(TScanner& scanner)
} }
} }
if (scanner.key() == "JO")
{
if (browse())
browse()->parse_join(scanner);
else
scanner.line();
return TRUE;
}
if (scanner.key() == "SH") // SHEET if (scanner.key() == "SH") // SHEET
{ {
#ifdef DBG #ifdef DBG