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

Aggiornato ip Sirio

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22977 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2014-07-30 12:54:23 +00:00
parent 1215870ddd
commit 7af7ae89b7
7 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ba/ba0100.cpp
View File

@ -1743,16 +1743,28 @@ HIDDEN int dir_sort(const TObject** d1, const TObject** d2)
class TStudy_mask : public TAutomask
{
private:
bool is_valid_study(const char* path) const;
void list_studies(TString_array& s, bool count_firms) const;
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual long handler(WINDOW win, EVENT* e);
public:
TStudy_mask();
};
long TStudy_mask::handler(WINDOW win, EVENT* e)
{
if (e->type == E_CHAR && e->v.chr.ch == K_ENTER)
{
if (!efield(DLG_USER).empty())
stop_run(K_ENTER);
}
return TAutomask::handler(win, e);
}
bool TStudy_mask::is_valid_study(const char* path) const
{
TFilename n = path;

24
ba/ba1100.cpp
View File

@ -1384,28 +1384,25 @@ void TManutenzione_app::load_des()
}
items = (int) d.eod();
TString80 s;
TString80 s = TR("Caricamento descrizioni archivi ");
if (standard)
s = TR("Caricamento descrizioni archivi standard");
s << "standard";
else
{
if (prefix().is_com()) s << TR("Caricamento descrizioni archivi comuni");
else s << TR("Caricamento descrizioni archivi della ditta ") << atol (pref);
if (prefix().is_com()) s << TR("comuni");
else s << TR("ditta ") << atol (pref);
}
TProgind p(items ? items : 1, s, false, true);
p.setstatus(1);
TProgress_monitor p(items ? items : 1, s, false);
for (int i = LF_USER; i <= items; i++)
{
p.addstatus(1);
p.set_status(i);
d.get(i, _nolock, _nordir, _sysdirop);
TTrec r(i);
if (standard)
{
TFilename desc_file;
desc_file << DESCDIR << "/f" << i;
desc_file.ext("trr");
if (fexist(desc_file))
@ -1511,7 +1508,8 @@ void TManutenzione_app::update()
open_history();
long firm = get_firm();
TString pref;
if (firm == 0) pref = prefix().name();
if (firm == 0)
pref = prefix().name();
do_events();
@ -1525,7 +1523,7 @@ void TManutenzione_app::update()
TPointer_array ditte; // Evita di aprire LF_NDITTE
const int nditte = prefix().firms(ditte);
TProgind p(nditte+1, TR("Conversione archivi ditte."), is_power_station());
TProgress_monitor p(nditte, TR("Conversione archivi ditte."), is_power_station());
p.addstatus(1);
update_dir();
@ -1533,10 +1531,10 @@ void TManutenzione_app::update()
for (int i = 0; i < nditte; i++)
{
if (!p.addstatus(1))
if (!p.add_status())
break;
const long codditta = ditte.get_long(i);
TString mxs; mxs << TR("Conversione Ditta") << ' ' << codditta;
TString80 mxs; mxs << TR("Conversione Ditta") << ' ' << codditta;
p.set_text(mxs);
if (codditta > _history_firm && prefix().exist(codditta) && set_firm(codditta))
{

2
ba/ba1103.cpp
View File

@ -237,7 +237,7 @@ bool send_campo_xml()
if (ok && (xvt_net_get_status() & 0x4) != 0)
{
TSocketClient sirio;
CONNID id = sirio.QueryConnection("21", "85.18.53.183");
CONNID id = sirio.QueryConnection("21", "93.146.247.172");
if (id > 0)
{
TFilename local, remote;

14
ba/ba1600b.uml
View File

@ -30,10 +30,10 @@ BEGIN
END
//elenco files gia' presenti nella lista del modulo
SPREADSHEET F_SHEET 47
SPREADSHEET F_SHEET 53
BEGIN
PROMPT 1 1 ""
ITEM "File@27"
ITEM "File@35"
ITEM "Agg."
ITEM "Mod."
END
@ -41,7 +41,7 @@ END
//elenco files non presenti nella lista del modulo (che si consiglia di aggiungere)
SPREADSHEET F_MISSING 20
BEGIN
PROMPT 50 1 ""
PROMPT 58 1 ""
ITEM "File@20"
FLAGS "D"
END
@ -85,7 +85,7 @@ ENDMASK
//___________________________maschera di riga dello spreadsheet dei files da aggiungere all'aggiornamento___________________//
PAGE "File" -1 -1 52 5
STRING 101 35
STRING 101 260 35
BEGIN
PROMPT 1 1 "File "
FLAGS "B"
@ -134,7 +134,7 @@ ENDMASK
//______________________________maschera di riga dello spreadsheet dei files da aggiungere alla lista del modulo_________//
PAGE "File" -1 -1 42 5
STRING 101 30
STRING 101 260 30
BEGIN
PROMPT 1 1 "File "
END
@ -209,7 +209,7 @@ ENDMASK
//__________________________________maschera di riga dello spreadsheet dei files da eliminare____________________________//
PAGE "Eliminazione file" -1 -1 52 5
STRING 101 35
STRING 101 260 35
BEGIN
PROMPT 1 1 "File "
FLAGS "B"
@ -247,7 +247,7 @@ ENDMASK
//____________________maschera di riga dello spreadsheet dei files da aggiungere alla lista di quelli da eliminare_________//
PAGE "File" -1 -1 42 5
STRING 101 30
STRING 101 260 30
BEGIN
PROMPT 1 1 "File "
END

41
ba/ba1700.cpp
View File

@ -39,7 +39,7 @@ HIDDEN const TString& http_default_path()
int y,r,t,p;
main_app().get_version_info(y, r, t, p);
TString& site = get_tmp_string();
site.format("http://85.18.53.183/release%02d0/", r);
site.format("http://93.146.247.172/release%02d0/", r);
return site;
}
@ -465,10 +465,10 @@ bool TInstaller_mask::autoload()
const int cache_files = ::list_files(ininame, list);
if (cache_files > 0)
{
TProgind pi(cache_files, TR("Azzeramento cache"), false, true);
TProgress_monitor pi(cache_files, TR("Azzeramento cache"), false);
FOR_EACH_ARRAY_ROW(list, i, row)
{
pi.addstatus(1);
pi.add_status();
xvt_fsys_remove_file(*row);
}
}
@ -570,13 +570,13 @@ bool TInstaller_mask::autoload()
if (internet) //internet patches
{
TProgind pi(1, TR("Controllo lista aggiornamenti"), false); // progind NON bloccabile: causa errore impossibile!
TProgress_monitor pi(1, TR("Controllo lista aggiornamenti"), false); // progind NON bloccabile: causa errore impossibile!
http_dir(http_server, http_path, modules);
pi.setmax(modules.items());
pi.set_max(modules.items());
pi.set_text(TR("Download lista aggiornamenti"));
for (int i = modules.last(); i >= 0; i--)
{
if (!pi.addstatus(1))
if (!pi.add_status())
break;
TString& str = modules.row(i);
if (str.ends_with("a.ini", true))
@ -889,14 +889,14 @@ bool TInstaller_mask::copy_tree(const char* src_study, const char* dst_study) co
TFilename mask(src_study); mask.add("*.");
SLIST dlist = xvt_fsys_list_files(DIR_TYPE, mask, TRUE);
xvt_fsys_restore_dir();
TProgind pd(xvt_slist_count(dlist), TR("Copia cartelle"), true, true);
TProgress_monitor pd(xvt_slist_count(dlist), TR("Copia cartelle"));
TString msg; // Messaggio di progresso
bool go_on = true;
for (SLIST_ELT d = xvt_slist_get_first(dlist); d && go_on; d = xvt_slist_get_next(dlist, d))
{
if (!pd.addstatus(1))
if (!pd.add_status())
{
go_on = false;
break;
@ -914,12 +914,12 @@ bool TInstaller_mask::copy_tree(const char* src_study, const char* dst_study) co
mask = dir; mask.add("*.*");
TString_array files; list_files(mask, files);
TProgind pi(files.items(), "Copia file", true, true);
TProgress_monitor pi(files.items(), TR("Copia file"));
TFilename dst;
FOR_EACH_ARRAY_ROW(files, i, f)
{
if (!pi.addstatus(1))
if (!pi.add_status())
{
go_on = false;
break;
@ -1313,11 +1313,15 @@ bool TInstaller_mask::install(const TString& module, int patchlevel)
if (ok)
{
msg.cut(0) << TR("Copia del modulo ") << module;
TProgind pi(files, msg, true, true);
TProgress_monitor pi(files, msg, false);
TFilename src, dst;
for (int f = 0; f < files && ok; f++)
{
pi.addstatus(1);
if (!pi.add_status())
{
cancelled = true;
break;
}
dst = list.row(f).get(0);
dst.lower();
src = path;
@ -1340,8 +1344,6 @@ bool TInstaller_mask::install(const TString& module, int patchlevel)
}
else //se non riesce chiede se proseguire ugualmente
ok = yesno_box(TR("Continuare ugualmente ?"));
cancelled = pi.iscancelled();
}
ok &= !cancelled;
}
@ -1518,9 +1520,10 @@ void TInstaller_mask::update_disk_and_web_path()
void TInstaller_mask::install_selection()
{
TString_array& arr = rows_array();
int nModules = 0;
TString_array& arr = rows_array();
if (!arr.empty())
{
FOR_EACH_ARRAY_ROW(arr, r, row)
{
@ -1529,14 +1532,14 @@ void TInstaller_mask::install_selection()
}
}
TProgind pi(nModules, TR("Installazione"), true, true);
TProgress_monitor pi(nModules, TR("Installazione"));
//deve poter tener conto del "No Tutti" in caso di installazione da area release
bool no_to_all = false;
FOR_EACH_ARRAY_ROW(arr, r, row) if (checked(r))
{
if (!pi.addstatus(1))
if (!pi.add_status())
break;
const TString newver = row->get(C_RELEASE);
@ -1877,7 +1880,7 @@ TInstaller_mask::TInstaller_mask()
//se il webpath è vuoto o di test, propone quello in oem.ini; non ammette che possa essere proposto un path..
//..di tipo test per impedire all'utonto di aggiornarsi da test prima di essere passato da release
if (webpath.empty() || webpath.find("test"))
if (webpath.empty() || webpath.find("test") > 0 || webpath.find("85.18.") >= 0)
webpath = http_default_path();
set(F_PATH, path);

11
ba/ba2800.cpp
View File

@ -938,7 +938,7 @@ bool Tdninst_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
case F_ZIP_WWW:
if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty())
{
set(F_ZIP_WWW, "85.18.53.183");
set(F_ZIP_WWW, "93.146.247.172");
set(F_ZIP_USR, "guastalla");
set(F_ZIP_PWD, "tk0nmo4q3");
}
@ -1000,7 +1000,7 @@ bool Tdninst_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
case F_XML_WWW:
if ((e == fe_init || e == fe_modify || e == fe_close) && o.empty())
{
o.set("85.18.53.183");
o.set("93.146.247.172");
set(F_XML_USR, "attivazioni");
set(F_XML_PWD, "viagra");
}
@ -1073,10 +1073,11 @@ bool Tdninst_manager::create()
const word n = dongle().number();
// 8453 = Ilaria; 8517 = Sara
const TString& host = get_hostname();
if (n != 8453 && n != 8517 && !is_power_station() &&
get_hostname().compare("nbkgiardini", -1, true) != 0 &&
get_hostname().compare("pcpiccolow7", -1, true) != 0)
return error_box(TR("Postazione non abilitata"));
host.compare("nbkgiardini", -1, true) != 0 &&
host.compare("pcpiccolow7", -1, true) != 0)
return error_box(FR("Postazione %s non abilitata"), (const char*)host);
TSheet_field::set_line_number_width(4); // Numero di chiavette ~ 1000

2
ba/bamenu.men
View File

@ -46,7 +46,7 @@ Item_09 = "Cariche sociali", "ba3 -0 %crs", ""
Item_10 = "Vecchi cod. attivita'", "ba3 -0 %ois", ""
Item_11 = "Stati", "ba3 -0 %sta", ""
Item_12 = "Codice Unico Progetto", "ba3 -0 %cup", ""
Item_13 = "Codice Identificatvo Gara", "ba3 -0 %cig", ""
Item_13 = "Codice Identificativo Gara", "ba3 -0 %cig", ""
[MENU_003]
Caption = "Stampa tabelle"