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

Revert "Patch level : nopatch"

Browse Source 
This reverts commit 830e58a74f1e8413551bae769241ec6cec3f7b49.
This commit is contained in:
smen 2021-12-17 17:11:01 +01:00
parent 5300fe55dc
commit a02d3f8d27
9 changed files with 341 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

394
src/ba/ba1100.cpp
View File

@ -1,11 +1,11 @@
#ifdef WIN32
#define _CRT_NONSTDC_NO_DEPRECATE 1
#define _CRT_SECURE_NO_WARNINGS 1
#include <io.h>
#include <share.h>
#define _CRT_NONSTDC_NO_DEPRECATE 1
#define _CRT_SECURE_NO_WARNINGS 1
#include <io.h>
#include <share.h>
#else
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
#endif
#include <sys/stat.h>
@ -13,9 +13,11 @@
#include "ba1100.h"
#include "ba1103.h"
#include <applicat.h>
#include <dongle.h>
#include <relapp.h>
#include <printer.h>
#include <progind.h>
#include <reputils.h>
#include <utility.h>
#include <user.h>
@ -33,16 +35,69 @@
#define Dir_file "dir.gen"
#define Trc_file "trc.gen"
class TManutenzione_app : public TSkeleton_application
{
TDir_sheet* _browse;
TArray _dirs;
TArray _recs;
TMask* _mask;
long _firm;
long _level;
long _history_firm;
TRec_sheet* _rec;
TLog_report* _log;
bool _print_log;
bool _superprassi;
protected:
virtual void main_loop();
virtual bool create () ;
virtual bool destroy();
void insert_riga(long, TToken_string&);
void edit_riga(long, TToken_string&);
void edit_riga(const TString&);
void delete_riga(long);
virtual bool extended_firm() const { return true; }
bool set_converting();
bool reset_converting();
bool try_to_recover(TSystemisamfile& f, int err);
void update();
void update_dir();
void convert_dir();
virtual void print();
virtual void do_print(TPrinter & p, TRec_sheet & r);
const char* dumpfilename(const FileDes& dep) const;
void load_des();
void open_history();
void put_history(const char* firm);
void close_history();
void dump_trc(const char * dir, const bool des_too, const long modules);
void repair_file(int i);
void save_file(const char * file);
void open_log();
void write_log(const char* line, const int severity = 0);
void close_log();
bool moveable_file(int file) const;
public:
TManutenzione_app();
};
HIDDEN bool browse_file_handler(TMask_field& f, KEY k)
{
if (k == K_F9)
{
{
FILE_SPEC fs; memset(&fs, 0, sizeof(FILE_SPEC));
TFilename fname = f.get(); fname.ext("dbf");
xvt_fsys_convert_str_to_fspec(fname, &fs);
xvt_fsys_get_default_dir(&fs.dir);
if (xvt_dm_post_file_open(&fs, TR("Selezione file")) == FL_OK)
{
{
TFilename n;
xvt_fsys_convert_dir_to_str(&fs.dir, n.get_buffer(n.size()), n.size());
n.add(fs.name);
@ -62,51 +117,51 @@ TManutenzione_app::TManutenzione_app() : _browse(NULL), _mask(NULL), _firm(0), _
strncpy_s(fd.SysName, "$dir.gen", sizeof(fd.SysName));
strncpy_s(fd.Des, "Directory", sizeof(fd.Des));
strncpy_s(fd.FCalc, "0", sizeof(fd.FCalc));
strncpy_s(fd.GenPrompt, "", sizeof(fd.GenPrompt));
fd.LenR = 160;
strncpy_s(fd.GenPrompt,"", sizeof(fd.GenPrompt));
fd.LenR =160;
fd.EOD = fd.EOX = 1L;
fd.Flags = 0;
#ifdef WIN32
int handle = sopen(Dir_file, O_RDWR | O_BINARY | O_CREAT, SH_DENYNO, S_IREAD | S_IWRITE);
int handle = sopen(Dir_file, O_RDWR|O_BINARY|O_CREAT,SH_DENYNO,S_IREAD|S_IWRITE);
#else
int handle = open(Dir_file, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
int handle = open(Dir_file, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
#endif
if (handle != -1)
{
if (write(handle, &fd, sizeof(FileDes)) == -1)
fatal_box("Impossibile scrivere il file dir.gen per dati standard: errore %d", errno);
if (write( handle, &fd, sizeof(FileDes)) == -1)
fatal_box("Impossibile scrivere il file dir.gen per dati standard: errore %d",errno);
close(handle);
}
else
fatal_box("Impossibile creare il file dir.gen per dati standard: errore %d", errno);
else
fatal_box("Impossibile creare il file dir.gen per dati standard: errore %d",errno);
}
if (!fexist(Trc_file))
{
TTrec r;
RecDes& rd = r.rec();
#ifdef WIN32
int handle = sopen(Trc_file, O_RDWR | O_BINARY | O_CREAT, SH_DENYNO, S_IREAD | S_IWRITE);
int handle = sopen(Trc_file, O_RDWR|O_BINARY|O_CREAT,SH_DENYNO,S_IREAD|S_IWRITE);
#else
int handle = open(Trc_file, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
int handle = open(Trc_file, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
#endif
if (handle != -1)
{
if (write(handle, (void*)&rd, sizeof(RecDes)) == -1)
fatal_box("Impossibile scrivere il file trc.gen per dati standard: errore %d", errno);
if (write( handle, (void*)&rd, sizeof(RecDes)) == -1)
fatal_box("Impossibile scrivere il file trc.gen per dati standard: errore %d",errno);
close(handle);
}
else
fatal_box("Impossibile creare il file trc.gen per dati standard: errore %d", errno);
else
fatal_box("Impossibile creare il file trc.gen per dati standard: errore %d",errno);
}
}
void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
{
const char* table[] = { "", TR("Alfanumerico"), TR("Intero"), TR("Intero Lungo"),
const char* table[] = {"", TR("Alfanumerico"), TR("Intero"), TR("Intero Lungo"),
TR("Reale"), TR("Data"), TR("Intero"), TR("Carattere"),
TR("Booleano"), TR("Intero Zerofilled"), TR("Intero Lungo Zerofilled"),TR("Memo") };
TR("Booleano"), TR("Intero Zerofilled"), TR("Intero Lungo Zerofilled"),TR("Memo")};
TPrintrow row;
TToken_string s;
TParagraph_string d("", 25);
@ -125,7 +180,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
row.reset();
if (istab)
row.put(format(FR("Lista tabella %s "), (const char *)tab), 2);
row.put(format(FR("Lista tabella %s "), (const char *) tab), 2);
else
row.put(format(FR("Lista tracciato %s (%s)"), dir.des(), dir.name()), 2);
row.put(TR("Pag. @#"), 69);
@ -147,7 +202,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
int i;
for (i = 0; i < rec.fields(); i++)
for (i = 0; i < rec.fields(); i ++)
{
row.reset();
s = rec.fielddef(i);
@ -173,7 +228,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
}
p.print(row);
wd = d.get();
while (wd != NULL)
while(wd != NULL)
{
row.reset();
row.put(wd, 53);
@ -181,7 +236,7 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
wd = d.get();
}
}
}
}
row.reset();
p.print(row);
@ -192,14 +247,14 @@ void TManutenzione_app::do_print(TPrinter & p, TRec_sheet & r)
if (p.rows_left() < 5)
p.formfeed();
else
else
{
p.print(row);
row.put(riga, 1);
p.print(row);
}
p.print(row);
}
for (i = 0; i < rec.keys(); i++)
for (i = 0; i < rec.keys(); i ++)
{
row.reset();
s = rec.keydef(i);
@ -256,17 +311,18 @@ void TManutenzione_app::print()
}
}
}
else
else
do_print(p, *_rec);
p.close();
}
bool TManutenzione_app::create() // initvar e arrmask
{
TString sw(argc() > 2 ? argv(2) : "");
_firm = get_firm();
TString sw(argc()>2 ? argv(2) : "");
// Posso fare le operazione avanzate solo se sono ammistratore
// e NON mi trovo su di una installazione di tipo client
xvt_vobj_show(TASK_WIN);
_superprassi = user() == ::dongle().administrator() && !::dongle().demo();
if (_superprassi)
@ -300,13 +356,12 @@ bool TManutenzione_app::create() // initvar e arrmask
modules = atol(argv(5));
prefix().set("");
load_des();
dump_trc(dir, des_too, modules);
dump_trc(dir,des_too,modules);
return false;
}
else
if (!::dongle().demo() && !set_firm())
return false;
_firm = atol(prefix().name());
load_des();
_mask = new TMask("ba1100a");
@ -330,24 +385,6 @@ bool TManutenzione_app::destroy()
return TApplication::destroy();
}
void TManutenzione_app::show_log()
{
if (db_log())
{
if (admin())
{
TLog_mask m;
m.run();
}
else
message_box(TR("Il log delle transazioni è visualizzabile dall'amministratore"));
}
else
message_box(TR("Il log delle transazioni è disattivato"));
}
void TManutenzione_app::open_log()
{
_print_log = false;
@ -389,21 +426,21 @@ void TManutenzione_app::save_file(const char * file)
TString_array files_to_copy;
list_files(n, files_to_copy);
dest_path << "sav";
dest_path << "sav";
if (!dest_path.exist())
make_dir(dest_path);
FOR_EACH_ARRAY_ROW_BACK(files_to_copy, row, fname)
{
{
TFilename source_file(*fname);
TFilename dest_file(dest_path); dest_file << '/' << (const char *)source_file.name();
fcopy((const char *)source_file, dest_file);
TFilename dest_file(dest_path); dest_file << '/' << (const char *) source_file.name();
fcopy((const char *) source_file, dest_file);
}
}
void TManutenzione_app::insert_riga(long riga_sel, TToken_string& riga)
void TManutenzione_app::insert_riga (long riga_sel, TToken_string& riga)
{
const int logicnum = int(riga_sel) + 1;
const int num_files = (int)_browse->items();
@ -412,30 +449,30 @@ void TManutenzione_app::insert_riga(long riga_sel, TToken_string& riga)
_mask->disable(DLG_RECORD);
_mask->disable(DLG_LOAD);
_mask->disable(DLG_DUMP);
_mask->show(F_TAB, (logicnum >= LF_TABGEN && logicnum <= LF_TAB) || (logicnum == LF_TABMOD));
_mask->show(F_TAB, (logicnum >= LF_TABGEN && logicnum <= LF_TAB)||(logicnum == LF_TABMOD));
_mask->hide(FLD_EXTEND);
_mask->hide(FLD_EOX);
_mask->set(FLD_NUM, riga.get(0));
_mask->reset(F_TAB);
_mask->set (FLD_NUM, riga.get(0));
_mask->reset (F_TAB);
if (_mask->run() == K_ENTER)
{
/* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */
for (int i = num_files; i >= logicnum; i--)
for (int i=num_files; i>=logicnum; i--)
{
_browse->dir().get(i, _nolock, _nordir, _sysdirop);
_browse->dir().put(i + 1, _nordir, _sysdirop);
_browse->rec().get(i);
_browse->rec().put(i + 1);
_browse->dir().get (i, _nolock, _nordir, _sysdirop);
_browse->dir().put (i + 1, _nordir, _sysdirop);
_browse->rec().get (i);
_browse->rec().put (i + 1);
}
_browse->dir().set(_mask->get(FLD_NOME), _mask->get_long(FLD_EOD),
_mask->get_long(FLD_FLAG), _mask->get(FLD_DESC),
_mask->get(FLD_FORMULA));
_mask->get_long(FLD_FLAG), _mask->get (FLD_DESC),
_mask->get (FLD_FORMULA));
_browse->dir().put(logicnum, _nordir, _sysdirop);
_browse->rec().zero();
_browse->rec().put(logicnum);
_browse->dir().get(LF_DIR);
_browse->dir().set_eod(_browse->dir().eod() + 1);
_browse->dir().set_eod(_browse->dir().eod()+1);
_browse->set_items(_browse->dir().eod());
_browse->dir().put(LF_DIR);
}
@ -443,32 +480,32 @@ void TManutenzione_app::insert_riga(long riga_sel, TToken_string& riga)
void TManutenzione_app::open_history()
{
FILE *fp = fopen(History_file, "r");
FILE *fp = fopen(History_file,"r");
if (fp != NULL)
{
char line[16];
fgets(line, 16, fp);
fgets(line,16,fp);
int l = strlen(line);
line[l > 0 ? l - 1 : 0] = '\0';
if (l == 0)
line[l > 0 ? l -1 : 0 ] = '\0';
if (l==0)
_history_firm = -1;
else
_history_firm = atol(line);
}
else
{
fp = fopen(History_file, "w");
fp = fopen(History_file,"w");
_history_firm = -1;
}
fclose(fp);
fclose (fp);
}
void TManutenzione_app::put_history(const char* firm)
{
FILE * fp = fopen(History_file, "w");
fprintf(fp, "%s\n", firm);
fclose(fp);
FILE * fp = fopen(History_file,"w");
fprintf(fp,"%s\n",firm);
fclose (fp);
}
void TManutenzione_app::close_history()
@ -481,7 +518,7 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
{
TDir d;
d.get(LF_DIR);
const int items = (int)d.eod();
const int items = (int) d.eod();
const long flags = d.flags(); // livello archivi
TFilename fn(dir);
fn << "/level.dir";
@ -494,7 +531,7 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
s << dir;
TProgind p(items ? items : 1, s, false, true);
p.setstatus(1);
for (int i = 2; i <= items; i++) //Salta il primo (dir.gen)
for (int i=2;i<=items;i++) //Salta il primo (dir.gen)
{
p.addstatus(1);
TTrec& rc = (TTrec&)_recs[i];
@ -504,16 +541,16 @@ void TManutenzione_app::dump_trc(const char * dir, const bool des_too, const lon
TFilename descfname;
descfname.format("%s/d%d.des", DESCDIR, i);
if (!fexist(descfname)) // crea la descrizione se non esiste
{
FILE * fd = fopen(descfname, "w");
{
FILE * fd = fopen(descfname, "w");
if (fd != NULL)
fclose(fd);
}
TConfig conf_des(descfname, DESCPAR);
TConfig conf_des(descfname,DESCPAR);
if (des_too) rc.set_des(&conf_des);
fn = dir;
fn << "/f"; fn << i;
fn << "/f";fn << i;
fn.ext("trr");
ofstream out(fn);
out << rc;
@ -536,21 +573,21 @@ const char* TManutenzione_app::dumpfilename(const FileDes& dep) const
return tmp;
}
void TManutenzione_app::edit_riga(const TString& name)
void TManutenzione_app::edit_riga (const TString& name)
{
const TFilename n(name);
TExternisamfile* f = new TExternisamfile(n);
_mask->set(FLD_NUM, "");
_mask->set(FLD_NOME, n);
_mask->set(FLD_EOD, f->items());
_mask->set(FLD_EOX, f->items());
_mask->set(F_LEN, f->curr().len());
_mask->set(FLD_DESC, f->description());
_mask->set(FLD_FORMULA, "");
_mask->set(FLD_FLAG, "");
_mask->reset(FLD_EXTEND);
_mask->reset(F_TAB);
_mask->set (FLD_NUM, "");
_mask->set (FLD_NOME, n);
_mask->set (FLD_EOD, f->items());
_mask->set (FLD_EOX, f->items());
_mask->set (F_LEN, f->curr().len());
_mask->set (FLD_DESC, f->description());
_mask->set (FLD_FORMULA, "");
_mask->set (FLD_FLAG, "");
_mask->reset (FLD_EXTEND);
_mask->reset (F_TAB);
_mask->disable(-1);
_mask->enable(DLG_RECORD, _superprassi);
@ -575,7 +612,7 @@ void TManutenzione_app::edit_riga(const TString& name)
}
}
void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
{
const int logicnum = int(riga_sel) + 1;
@ -585,16 +622,16 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
_mask->enable(DLG_DUMP);
_mask->show(F_TAB, logicnum >= LF_TABGEN && logicnum <= LF_TAB);
_mask->set(FLD_NUM, riga.get(0));
_mask->set(FLD_NOME, riga.get());
_mask->set(FLD_EOD, riga.get());
_mask->set(FLD_EOX, riga.get());
_mask->set(F_LEN, riga.get());
_mask->set(FLD_DESC, riga.get());
_mask->set(FLD_FORMULA, riga.get());
_mask->set(FLD_FLAG, riga.get());
_mask->reset(FLD_EXTEND);
_mask->reset(F_TAB);
_mask->set (FLD_NUM, riga.get(0));
_mask->set (FLD_NOME, riga.get());
_mask->set (FLD_EOD, riga.get());
_mask->set (FLD_EOX, riga.get());
_mask->set (F_LEN, riga.get());
_mask->set (FLD_DESC, riga.get());
_mask->set (FLD_FORMULA, riga.get());
_mask->set (FLD_FLAG, riga.get());
_mask->reset (FLD_EXTEND);
_mask->reset (F_TAB);
const TRecnotype oldeox = _mask->get_long(FLD_EOX);
const bool com = prefix().is_com() || !*prefix().name();
@ -631,11 +668,11 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
case K_ENTER:
{
FileDes dep;
strncpy(dep.SysName, _mask->get(FLD_NOME), sizeof(dep.SysName));
dep.EOD = atol(_mask->get(FLD_EOD));
dep.Flags = atol(_mask->get(FLD_FLAG));
strncpy(dep.Des, _mask->get(FLD_DESC), sizeof(dep.Des));
strncpy(dep.FCalc, _mask->get(FLD_FORMULA), sizeof(dep.FCalc));
strncpy (dep.SysName,_mask->get(FLD_NOME), sizeof(dep.SysName));
dep.EOD = atol(_mask->get (FLD_EOD));
dep.Flags = atol(_mask->get (FLD_FLAG));
strncpy (dep.Des,_mask->get (FLD_DESC), sizeof(dep.Des));
strncpy (dep.FCalc,_mask->get (FLD_FORMULA), sizeof(dep.FCalc));
const TRecnotype eox = _mask->get_bool(FLD_EXTEND) ? _mask->get_long(FLD_EOX) : oldeox;
TDir& dir = _browse->dir();
@ -652,7 +689,7 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
TFilename f_name(d.name());
f_name.ext("dbf");
if (!f_name.exist())
if (!f_name.exist())
f.build();
_browse->dir().get(logicnum, _nolock, _nordir, _sysdirop);
@ -661,7 +698,7 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
{
f.packfile(true);
f.packindex(true);
// le 4 righe seguenti servono per allineare i valori di EOD ed EOX dopo una compattazione forzata
// le 4 righe seguenti servono per allineare i valori di EOD ed EOX dopo una compattazione forzata
dir.get(logicnum, _nolock, _nordir, _sysdirop);
dir.set(dep.SysName, dep.EOD, dep.Flags, dep.Des, dep.FCalc);
dir.set_eox(_browse->dir().eod());
@ -695,8 +732,8 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
const int keyno = m.get_int(FLD_KEYNO);
const TString4 tabella(_mask->get(F_TAB));
if (tabella.not_empty())
{
TToken_string filter;
{
TToken_string filter;
filter.add("COD"); filter.add(tabella);
f.dump(nout, keyno, fs, fd, rs, true, withdel, filter);
}
@ -733,19 +770,19 @@ void TManutenzione_app::edit_riga(long riga_sel, TToken_string& riga)
}
}
void TManutenzione_app::delete_riga(long riga_sel)
void TManutenzione_app::delete_riga (long riga_sel)
{
const int num_files = (int)_browse->items();
const int logicnum = int(riga_sel) + 1;
if (riga_sel == num_files - 1 && yesno_box(FR("Si conferma l'eliminazione del file %d"), logicnum))
if (riga_sel == num_files-1 && yesno_box(FR("Si conferma l'eliminazione del file %d"), logicnum))
{
/* shift di uno in avanti degli elementi del direttorio partendo dall'ultimo */
for (int i = logicnum + 1; i <= num_files; i++)
{
_browse->dir().get(i, _nolock, _nordir, _sysdirop);
_browse->dir().put(i - 1, _nordir, _sysdirop);
_browse->rec().get(i);
_browse->rec().put(i - 1);
_browse->dir().get (i, _nolock, _nordir, _sysdirop);
_browse->dir().put (i - 1, _nordir, _sysdirop);
_browse->rec().get (i);
_browse->rec().put (i - 1);
}
_browse->dir().get(LF_DIR);
@ -753,7 +790,7 @@ void TManutenzione_app::delete_riga(long riga_sel)
TTrec r;
r.zero();
r.put(_browse->dir().eod());
_browse->dir().set_eod(_browse->dir().eod() - 1);
_browse->dir().set_eod(_browse->dir().eod()-1);
_browse->set_items(_browse->dir().eod());
_browse->dir().put(LF_DIR);
_browse->force_update();
@ -773,7 +810,7 @@ void TManutenzione_app::repair_file(int i)
{
TString s(_MAX_PATH + 50); // Messaggio di log
TDir d(i);
TDir d(i);
const char* n = d.filename();
if (d.eod() == 0)
@ -794,10 +831,10 @@ void TManutenzione_app::repair_file(int i)
TExternisamfile ef(n);
const RecDes& rd = ef.curr().rec_des();
TTrec rec; rec.get(i);
TTrec rec; rec.get(i);
const int oldreclen = rec.len();
rec.rec() = rd;
rec.put(i);
rec.put(i);
const int reclen = rec.len();
d.set_len(reclen);
@ -832,7 +869,7 @@ void TManutenzione_app::update_dir()
safely_close_closeable_isamfiles(); // Serve a premettere la chiamata ad fsize() in sicurezza
TString prompt(128);
if (is_com)
if (is_com)
prompt << TR("Aggiornamento dati comuni");
else
prompt << TR("Aggiornamento ditta") << ' ' << atol(pref);
@ -846,7 +883,7 @@ void TManutenzione_app::update_dir()
if (!p.setstatus(i))
break;
const TDir & ds = (const TDir &)_dirs[i];
const TDir & ds = (const TDir &) _dirs[i];
const bool is_firm = ds.is_firm();
const bool to_create = (is_com ? ds.is_com() : ds.is_firm());
@ -880,10 +917,10 @@ void TManutenzione_app::update_dir()
else
{
if (is_com)
{
{
if (old_is_firm && !moveable_file(i) && d.eod() == 0L)
{
const char* n = d.filename();
const char* n = d.filename();
save_file(n);
TToken_string names; get_table_names(i, names, 0xF);
@ -904,7 +941,7 @@ void TManutenzione_app::update_dir()
int err = b.is_valid(true);
// Aggiunto err==-60 per errore conversione sui file 98,99,125 in Pharmatex e dintorni
if ((err == _istrcerr || err == _ispatherr || err == -60) && (d.eod() == 0) && (size < 4096))
{
{
bool kill = true;
//controllo solo all'aga
if (is_power_station())
@ -938,7 +975,7 @@ void TManutenzione_app::update_dir()
}
if (err != NOERR && flags < 10000L)
{
if (!try_to_recover(b, err))
if (!try_to_recover(b, err))
{
msg.format(TR("Impossibile compattare il file %d - %s : errore n.ro %d"),
i, (const char*)d.filename(), err);
@ -988,10 +1025,10 @@ void TManutenzione_app::update_dir()
if (!valid_file)
d.set(ds.name(), d.eox(), d.eod(), ds.des(), d.expr());
else
strcpy((char *)d.des(), ds.des());
strcpy((char *) d.des(), ds.des());
}
}
if (is_com && valid_file && d.name()[0] == '$')
if (is_com && valid_file && d.name()[0] == '$')
{
TString name(d.name());
name[0] = '%';
@ -1005,7 +1042,7 @@ void TManutenzione_app::update_dir()
//se il numero totale di files nuovi è inferiore a quello dei files già presenti c'è qualcosa che probabilmente..
//..non va (aggiornamento da un cd vecchio ad esempio); comunque ha finito il suo lavoro qui, perchè quello che..
//..segue riguarda solo i files nuovi
if (last_curr_item >= last_new_item)
if (last_curr_item >= last_new_item)
return;
//aggiornatore degli EOX EOD ecc. dei files nuovi
@ -1040,10 +1077,10 @@ void TManutenzione_app::convert_dir()
TString s;
s << TR("Aggiornamento archivi ");
if (is_com)
if (is_com)
s << TR("comuni");
else
s << TR("ditta ") << atol(pref);
s << TR("ditta ") << atol (pref);
s << ".\n";
TProgress_monitor p(update_items, s, is_power_station());
@ -1053,7 +1090,7 @@ void TManutenzione_app::convert_dir()
break;
const TTrec& rs = (const TTrec&)_recs[i]; // Nuovo tracciato record
const TDir& ds = (const TDir&)_dirs[i];
const TDir& ds = (const TDir&)_dirs[i];
const long flags = ds.flags();
if (ds.len() > 0)
@ -1067,11 +1104,11 @@ void TManutenzione_app::convert_dir()
const int module = abs((int)ds.flags());
TSystemisamfile f(i);
int err = f.is_valid(true);
int err = f.is_valid(true);
switch (err)
{
case -64:
case -60:
case -60:
err = NOERR; // verif.
break;
default:
@ -1079,7 +1116,7 @@ void TManutenzione_app::convert_dir()
}
if (i > LF_USER && err != NOERR && ((is_com && d.is_com()) || (!is_com && d.is_firm())))
{
{
if (err == _istrcerr || err == _isbadtrc)
{
repair_file(i);
@ -1111,7 +1148,7 @@ void TManutenzione_app::convert_dir()
//crea il nuovo file in base al tracciato record nuovo!
if (!fname.exist() && ds.len() > 0 && rs.len() > 0)
{
set_autoload_new_files(false);
set_autoload_new_files(false);
f.build(rs);
set_autoload_new_files(true);
// Anche se il file non esisteva, prosegue, perche' possono esserci conversioni
@ -1185,10 +1222,10 @@ void TManutenzione_app::load_des()
// Cerca in RECDESC i files f[nnn].dir
TString ws;
TFilename fn;
TDir td, new_dir;
TDir td,new_dir;
TTrec tr;
int ln = items, last_newln = items;
int ln = items,last_newln = items;
tr.zero();
fn << DESCDIR << "/level.dir";
@ -1204,7 +1241,7 @@ void TManutenzione_app::load_des()
// eventuali "buchi" oltre al numero attuale di items vengono rimpiazzati
// con tracciati vuoti.
fn.format("%s/f*.dir", DESCDIR);
fn.format("%s/f*.dir",DESCDIR);
TString_array list;
const int totfiles = list_files(fn, list);
@ -1221,36 +1258,36 @@ void TManutenzione_app::load_des()
const bool is_new = ln > last_newln; // memorizza l'ultimo record scritto come nuovo
if (is_new) // aggiunge i files che mancano
{
for (int i = last_newln + 1; i < ln; i++)
for (int i = last_newln+1; i<ln; i++)
{
ws.format("$f%d", i);
new_dir.set(ws, 0L, -1L, TR("File non presente"), "");
new_dir.put(i, _nordir, _sysdirop);
tr.put(i);
ws.format("$f%d",i);
new_dir.set(ws,0L,-1L, TR("File non presente"),"");
new_dir.put(i,_nordir,_sysdirop);
tr.put(i);
}
last_newln = ln;
}
td.put(ln, _nordir, _sysdirop);
td.put(ln,_nordir,_sysdirop);
if (is_new)
tr.put(ln);
}
}
d.set_eod(last_newln);
d.set_eox(last_newln);
d.set_flags(_level = flags);
prefix().set_stdlevel(flags);
d.put(LF_DIR, _nordir, _sysdirop);
d.put(LF_DIR,_nordir,_sysdirop);
}
items = (int)d.eod();
items = (int) d.eod();
TString80 s = TR("Caricamento descrizioni archivi ");
if (standard)
if (standard)
s << "standard";
else
{
if (prefix().is_com()) s << TR("comuni");
else s << TR("ditta ") << atol(pref);
else s << TR("ditta ") << atol (pref);
}
TProgress_monitor p(items ? items : 1, s, false);
@ -1262,7 +1299,7 @@ void TManutenzione_app::load_des()
if (standard)
{
TFilename desc_file;
TFilename desc_file;
desc_file << DESCDIR << "/f" << i;
desc_file.ext("trr");
if (fexist(desc_file))
@ -1274,8 +1311,8 @@ void TManutenzione_app::load_des()
descfname.format("%s/d%d.des", DESCDIR, i);
if (!fexist(descfname))
{
FILE* fd = fopen(descfname, "w");
{
FILE* fd = fopen(descfname, "w");
if (fd != NULL)
fclose(fd);
}
@ -1284,13 +1321,13 @@ void TManutenzione_app::load_des()
r.set_des(&descr);
in >> r;
r.put(i);
r.put(i);
d.set_len(r.len());
d.put(i, _nordir, _sysdirop);
r.set_des();
}
}
}
}
_dirs.add(d, i);
_recs.add(r, i);
}
@ -1368,7 +1405,7 @@ void TManutenzione_app::update()
open_history();
long firm = get_firm();
TString pref;
if (firm == 0)
if (firm == 0)
pref = prefix().name();
prefix().set("");
@ -1378,8 +1415,8 @@ void TManutenzione_app::update()
TString mxs; mxs = TR("Conversione dati comuni");
open_log();
write_log(mxs);
write_log("");
write_log(mxs);
write_log("");
TPointer_array ditte; // Evita di aprire LF_NDITTE
const int nditte = prefix().firms(ditte);
@ -1393,9 +1430,9 @@ void TManutenzione_app::update()
if (codditta > _history_firm && prefix().exist(codditta) && set_firm(codditta))
{
mxs.cut(0) << TR("Conversione Ditta ") << codditta;
write_log("");
write_log(mxs);
write_log("");
write_log("");
write_log(mxs);
write_log("");
update_dir();
convert_dir();
}
@ -1428,7 +1465,7 @@ void TManutenzione_app::main_loop()
KEY key = _browse->run();
if (key != K_ENTER && key != K_QUIT && key != K_ESC &&
if (key != K_ENTER && key != K_QUIT && key != K_ESC &&
!_superprassi)
{
error_box(FR("Operazione non permessa all'utente %s"), (const char*)user());
@ -1452,29 +1489,29 @@ void TManutenzione_app::main_loop()
case K_F6:
riga_selezionata = _browse->selected();
riga = _browse->row();
insert_riga(riga_selezionata, riga);
insert_riga (riga_selezionata, riga);
break;
case K_ENTER:
riga_selezionata = _browse->selected();
riga = _browse->row();
edit_riga(riga_selezionata, riga);
edit_riga (riga_selezionata, riga);
break;
case K_DEL:
riga_selezionata = _browse->selected();
delete_riga(riga_selezionata);
break;
case K_QUIT:
case K_ESC:
done = true; close_history();
case K_ESC:
done = true; close_history();
break;
case K_F7:
update();
break;
case K_F7:
update();
break;
case K_F8:
_browse->add();
riga_selezionata = _browse->items() - 1;
riga = _browse->row(riga_selezionata);
edit_riga(riga_selezionata, riga);
edit_riga (riga_selezionata, riga);
break;
case K_F5: // Other file
{
@ -1497,3 +1534,4 @@ int ba1100(int argc, char** argv)
a.run(argc, argv, TR("Gestione files"));
return 0;
}

156
src/ba/ba1100.h
View File

@ -1,10 +1,6 @@
#ifndef __BA1100_H
#define __BA1100_H
#ifndef __APPLICAT_H
#include <applicat.h>
#endif
#ifndef __CONFIG_H
#include <config.h>
#endif
@ -21,14 +17,6 @@
class TMask_field;
#endif
#ifndef __PRINTER_H
#include <printer.h>
#endif
#ifndef __REPUTILS_H
#include <reputils.h>
#endif
#include "ba1100a.h"
///////////////////////////////////////////////////////////
@ -37,129 +25,71 @@ class TMask_field;
class TDir_sheet : public TSheet
{
TTrec _rec;
TDir _dir;
FileDes _s_dir;
long _items;
TTrec _rec;
TDir _dir;
FileDes _s_dir;
long _items;
protected:
virtual long get_items() const { return _items; }
virtual void get_row(long n, TToken_string& r);
virtual long get_items() const { return _items; }
virtual void get_row(long n, TToken_string& r);
public:
const TDir& dir() const { return _dir; }
TDir& dir() { return _dir; }
const TTrec& rec() const { return _rec; }
TTrec& rec() { return _rec; }
void set_items(long items) { _items = items; }
void add();
void rebuild() { _items = _dir.items(); }
const TDir& dir() const { return _dir; }
TDir& dir() { return _dir; }
const TTrec& rec() const { return _rec; }
TTrec& rec(){ return _rec; }
void set_items(long items) { _items = items; }
void add();
void rebuild() { _items = _dir.items();}
TDir_sheet(const char* title, bool superprassi);
TDir_sheet(const char* title, bool superprassi);
};
class TRec_sheet : public TObject
{
TTrec _rec;
TTrec _rec_old;
TDir _dir;
bool _comfile;
TConfig *_descr;
static TMask *_mask;
TFilename _descfname;
TString16 _tab;
bool _external;
TTrec _rec;
TTrec _rec_old;
TDir _dir;
bool _comfile;
TConfig *_descr;
static TMask *_mask;
TFilename _descfname;
TString16 _tab;
bool _external;
protected:
bool check_key_expr(int key, const char* key_expr);
static bool key_notify(TSheet_field& s, int r, KEY k);
static bool fld_notify(TSheet_field& s, int r, KEY k);
void save();
void save_desc();
bool check_key_expr(int key, const char* key_expr);
static bool key_notify(TSheet_field& s, int r, KEY k);
static bool fld_notify(TSheet_field& s, int r, KEY k);
void save();
void save_desc();
virtual long get_items() const { return _rec.fields(); }
virtual long get_items() const { return _rec.fields(); }
public:
const TDir& dir() const { return _dir; }
const TTrec& rec() const { return _rec; }
const char* descfname() const { return _descfname; }
const char* tab() const { return _tab; }
void edit();
const TDir& dir() const { return _dir; }
const TTrec& rec() const { return _rec; }
const char* descfname() const { return _descfname;}
const char* tab() const { return _tab; }
void edit();
TRec_sheet(int logicnum, const char* tab);
TRec_sheet(TExternisamfile* file);
virtual ~TRec_sheet();
TRec_sheet(int logicnum, const char* tab);
TRec_sheet(TExternisamfile* file);
virtual ~TRec_sheet();
};
class TEdit_file : public TObject
{
protected:
void edit_record(TRectype& rec);
bool browse_cursor(TCursor& cur, const TFilename& name);
void edit_record(TRectype& rec);
bool browse_cursor(TCursor& cur, const TFilename& name);
public:
bool browse_file(int logicnum, const TFilename& name, const TString& tab, const int selKey = 1);
bool browse_file(TExternisamfile* file, const TFilename& name);
TEdit_file() {}
virtual ~TEdit_file() {}
bool browse_file(int logicnum, const TFilename& name, const TString& tab, const int selKey = 1);
bool browse_file(TExternisamfile* file, const TFilename& name);
TEdit_file() {}
virtual ~TEdit_file() {}
};
class TManutenzione_app : public TSkeleton_application
{
TDir_sheet* _browse;
TArray _dirs;
TArray _recs;
TMask* _mask;
long _firm;
long _level;
long _history_firm;
TRec_sheet* _rec;
TLog_report* _log;
bool _print_log;
bool _superprassi;
protected:
virtual void main_loop();
virtual bool create();
virtual bool destroy();
void insert_riga(long, TToken_string&);
void edit_riga(long, TToken_string&);
void edit_riga(const TString&);
void delete_riga(long);
virtual bool extended_firm() const { return true; }
bool set_converting();
bool reset_converting();
bool try_to_recover(TSystemisamfile& f, int err);
void update();
void update_dir();
void convert_dir();
virtual void print();
virtual void do_print(TPrinter & p, TRec_sheet & r);
const char* dumpfilename(const FileDes& dep) const;
void load_des();
void open_history();
void put_history(const char* firm);
void close_history();
void dump_trc(const char * dir, const bool des_too, const long modules);
void repair_file(int i);
void save_file(const char * file);
virtual void show_log();
void open_log();
void write_log(const char* line, const int severity = 0);
void close_log();
bool moveable_file(int file) const;
public:
long get_firm() const { return _firm; }
TManutenzione_app();
};
inline TManutenzione_app & app() { return (TManutenzione_app &)main_app(); }
#endif

14
src/ba/ba1101.cpp
View File

@ -275,17 +275,9 @@ void TRec_sheet::edit()
}
f2.set_notify(key_notify);
f2.set_append(FALSE);
int nkeys = _rec.keys();
for (i = 0; i < nkeys; i++)
f2.row(i) = _rec.keydef(i);
f2.disable_cell(0, 1);
const bool enable_save = (_dir.is_com() && app().get_firm() == 0) ||
(_dir.is_firm() && app().get_firm() > 0);
_mask->enable(DLG_SAVEREC, enable_save);
int nkeys = _rec.keys();
for (i = 0; i < nkeys; i++) f2.row(i) = _rec.keydef(i);
f2.disable_cell(0, 1);
while (true)
{
f1.force_update(0); // Non togliere, serve per fare l'update della descrizione quando si fa l'import!!

6
src/ba/ba2900.cpp
View File

@ -136,7 +136,7 @@ protected:
bool dir_gen() const;
bool trc_gen() const;
bool export_manager(const TString generalErrors) const;
bool show_export_log();
bool show_log();
void log(int severity, const char* msg);
public:
@ -980,7 +980,7 @@ bool TMSSQLExport_app::export_manager(TString generalErrors) const
return true;
}
bool TMSSQLExport_app::show_export_log()
bool TMSSQLExport_app::show_log()
{
if (_log)
{
@ -1089,7 +1089,7 @@ void TMSSQLExport_app::main_loop()
}
message_box("Migrazione effettuata correttamente!");
} while (loop);
show_export_log();
show_log();
}
else
message_box("Fallita connessione");

14
src/ba/ba3400.cpp
View File

@ -52,24 +52,26 @@ bool TTestrel_application::user_destroy()
// Testmask
///////////////////////////////////////////////////////////
class TTest_application : public TSkeleton_application
class TTest_application : public TApplication
{
const char* _maskname;
protected:
void main_loop();
bool create() { return menu(0); }
bool destroy() { return TRUE; }
bool menu(MENU_TAG);
public:
TTest_application(const char* name) : _maskname(name) {}
};
void TTest_application::main_loop()
bool TTest_application::menu(MENU_TAG)
{
if (*_maskname)
{
TMask m(_maskname);
while (m.run() == K_ENTER);
KEY k = m.run();
if (k == K_QUIT) stop_run();
}
else
{
@ -81,6 +83,8 @@ void TTest_application::main_loop()
m.run();
}
}
return FALSE;
}
///////////////////////////////////////////////////////////

2
src/ba/ba3400a.uml
View File

@ -4,7 +4,7 @@ PAGE "Richiesta" -1 -1 76 12
STRING F_NOME 50
BEGIN
PROMPT 3 3 "Maschera "
PROMPT 3 3 "Nome maschera"
END
BUTTON DLG_OK 10 2

5
src/ba/ba7100.cpp
View File

@ -1742,7 +1742,6 @@ class TMailer : public TSkeleton_application
bool _start_full_screen;
protected:
virtual bool task_win_iconized() const { return !_start_full_screen && xvt_win_is_taskbar_visible(); }
virtual bool create();
virtual void main_loop();
};
@ -1768,7 +1767,7 @@ void TMailer::main_loop()
WINDOW tray = xvt_trayicon_create(TASK_WIN, 9013, appname); // CampoServer.ico
open_files(LF_USER, 0);
/* if (!_start_full_screen && xvt_win_is_taskbar_visible())
if (!_start_full_screen && xvt_win_is_taskbar_visible())
{
if (tray != NULL_WIN)
{
@ -1779,7 +1778,7 @@ void TMailer::main_loop()
if (xvt_rect_get_width(&rct_postman) >= xvt_rect_get_width(&rct_screen) - 64)
xvt_vobj_set_visible(TASK_WIN, FALSE);
}
} */
}
TMailer_mask mm;

15
src/ba/batbiva.uml
View File

@ -46,7 +46,7 @@ BEGIN
WARNING "Manca la descrizione"
END
LIST LST_TABIVA_S1 2 28
LIST LST_TABIVA_S1 2 20
BEGIN
PROMPT 2 2 "Tipo "
FIELD S1
@ -70,15 +70,11 @@ BEGIN
MESSAGE CLEAR,FLD_TABIVA_R0|CLEAR,FLD_TABIVA_I0
MESSAGE ENABLE,FLD_TABIVA_I3|ENABLE,FLD_TABIVA_I4|SHOW,CHK_TABIVA_B5
MESSAGE ENABLE,FLD_TABIVA_S6
ITEM "RC|Reverse Charge (vendite)"
MESSAGE CLEAR,FLD_TABIVA_R0|CLEAR,FLD_TABIVA_I0
MESSAGE CLEAR,FLD_TABIVA_I3|CLEAR,FLD_TABIVA_I4|HIDE,CHK_TABIVA_B5
MESSAGE ENABLE,FLD_TABIVA_S6
END
END
STRING FLD_TABIVA_S6 4
BEGIN
PROMPT 44 2 "C.IVA a cui ventilare "
PROMPT 39 2 "C.IVA a cui ventilare "
FLAGS "U"
FIELD S6
COPY USE FLD_TABIVA_CODTAB
@ -150,7 +146,7 @@ END
BOOLEAN CHK_TABIVA_B5
BEGIN
PROMPT 30 5 "Escluso dal calcolo dei bolli su fatture esenti"
PROMPT 30 5 "Escluso dal calcolo dei bolli sufatture esenti"
FIELD B5
END
@ -192,8 +188,6 @@ BEGIN
INPUT FLD_TABIVA_I3
OUTPUT FLD_TABIVA_I3
ITEM " |Nessuno"
ITEM "14|Passaggi interni"
ITEM "16|Cessioni beni ammortizzabili"
ITEM "20|Operazioni non imponibili (comma 1, artt.8, 8bis e 9)"
ITEM "21|Operazioni non imponibili a seguito di dich. d'intento"
ITEM "22|Altre operazioni non imponibili"
@ -207,7 +201,6 @@ BEGIN
ITEM "36|Cessione di microprocessori"
ITEM "37|Prestazioni comparto edile e settori connessi"
ITEM "38|Operazioni settore energetico"
ITEM "39|Reverse charge altri casi"
ITEM "B1|Ammontare op. es. escluse da nr. 1 a 9 e 11 art. 10"
ITEM "B2|Ammontare op. es. di cui al nr. 11 art. 10"
ITEM "B3|Ammontare op. es. di cui ai nr. 1 a 9 art. 10"

4
src/ba/f9.dir
View File

@ -1,3 +1,7 @@
9
1
<<<<<<< HEAD
%nditte|0|0|652|0|Ditte|||
=======
%nditte|0|0|754|0|Ditte|||
>>>>>>> 0cadcd6dee4a4a67021c26174d7dea2a761fe182