Patch level : 12.00 1262

Files correlati     :
Commento            :
nvio postino con ODBC

src/ba/ba1100.cpp

@@ -1109,6 +1109,9 @@ void TManutenzione_app::recover()
 
 	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
 }
 
@@ -1525,6 +1528,9 @@ void TManutenzione_app::update()
   reset_converting();
   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
 }
 

src/ba/ba7100.cpp

@@ -424,7 +424,7 @@ TFilter_expr::TFilter_expr(TAutomask& m, int logicnum, const char* expr)
     if (logicnum < LF_USER || logicnum >= prefix().items())
       logicnum = LF_TABCOM;   // Niente errori fatali, se possibile
       
-    const TRectype rec(logicnum);
+		const TRectype rec(logicnum);
 
 		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);
 				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)
     {

src/ba/ba7100a.uml

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