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

Patch level : 12.00 1262

Browse Source 
Files correlati     :
Commento            :
nvio postino con ODBC
This commit is contained in:
Alessandro Bonazzi 2023-05-28 12:10:49 +02:00
parent 15961f4046
commit 850dbf6978
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ba/ba1100.cpp
View File

@ -1109,6 +1109,9 @@ void TManutenzione_app::recover()
close_history(); close_history();
#ifdef DBG
if (!is_power_station() || ini_get_bool(CONFIG_GENERAL, "Main", "test_send_xml"))
#endif
send_campo_xml(); // Spedisce situazione via ftp send_campo_xml(); // Spedisce situazione via ftp
} }
@ -1525,6 +1528,9 @@ void TManutenzione_app::update()
reset_converting(); reset_converting();
close_history(); close_history();
#ifdef DBG
if (!is_power_station() || ini_get_bool(CONFIG_GENERAL, "Main", "test_send_xml"))
#endif
send_campo_xml(); // Spedisce situazione via ftp send_campo_xml(); // Spedisce situazione via ftp
} }

16
src/ba/ba7100.cpp
View File

@ -424,7 +424,7 @@ TFilter_expr::TFilter_expr(TAutomask& m, int logicnum, const char* expr)
if (logicnum < LF_USER || logicnum >= prefix().items()) if (logicnum < LF_USER || logicnum >= prefix().items())
logicnum = LF_TABCOM; // Niente errori fatali, se possibile logicnum = LF_TABCOM; // Niente errori fatali, se possibile
const TRectype rec(logicnum); const TRectype rec(logicnum);
for (int i = 0; i < numvar(); i++) for (int i = 0; i < numvar(); i++)
{ {
@ -436,8 +436,18 @@ TFilter_expr::TFilter_expr(TAutomask& m, int logicnum, const char* expr)
{ {
const TFieldref f(name, 0); const TFieldref f(name, 0);
int num = table2logic(f.id()); int num = table2logic(f.id());
const TRectype join(num);
ok = join.exist(f.name()); if (num > 0)
{
const TRectype join(num);
ok = join.exist(f.name());
}
else
{
error_box(FR("Tabella %s inesistente"), (const char *)f.name());
return;
}
} }
if (!ok) if (!ok)
{ {

12
src/ba/ba7100a.uml
View File

@ -196,13 +196,13 @@ BEGIN
ITEM "File" ITEM "File"
ITEM "OP@2" ITEM "OP@2"
ITEM "Filtro@64" ITEM "Filtro@64"
ITEM "ODBC Files@64" ITEM "ODBC tables@64"
GROUP G_SUPERUSER GROUP G_SUPERUSER
FLAGS "|" FLAGS "|"
END END
ENDPAGE ENDPAGE
ss
PAGE "Script" 0 0 0 -2 PAGE "Script" 0 0 0 -2
SPREADSHEET F_SCRIPTS 0 -1 SPREADSHEET F_SCRIPTS 0 -1
@ -359,26 +359,26 @@ PAGE "Parametri" -1 -1 62 12
STRING F_DEST 50 STRING F_DEST 50
BEGIN BEGIN
PROMPT 1 1 "Indirizzo " PROMPT 1 1 "Indirizzo "
END END
NUMBER F_FILE 3 NUMBER F_FILE 3
BEGIN BEGIN
PROMPT 1 2 "File " PROMPT 1 2 "File "
FLAGS "B" FLAGS "B"
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END
LIST F_OPERATOR 1 3 LIST F_OPERATOR 1 3
BEGIN BEGIN
PROMPT 46 3 "Operatore " PROMPT 46 3 "Operatore "
ITEM "A|And" ITEM "A|And"
ITEM "O|Or" ITEM "O|Or"
END END
STING F_FILES 60 STING F_FILES 60
BEGIN BEGIN
PROMPT 1 3 "ODBC files" PROMPT 1 3 "ODBC tables "
END END
MEMO F_EXPR 60 -3 MEMO F_EXPR 60 -3