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

Patch level : 10.0 nopatch

Browse Source 
Files correlati     : pd6342.exe
Ricompilazione Demo : [ ]
Commento

Habilita ripartizione ricorsiva


git-svn-id: svn://10.65.10.50/branches/R_10_00@20937 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2010-10-01 12:09:22 +00:00
parent 23975c448b
commit 664ce7e83a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/textset.cpp
View File

@ -198,7 +198,7 @@ bool TText_recordset::save_as_text(const char* path)
bool TText_recordset::save_as(const char* path, TRecordsetExportFormat fmt) bool TText_recordset::save_as(const char* path, TRecordsetExportFormat fmt)
{ {
if (fmt == fmt_text || fmt == fmt_unknown) if (fmt == fmt_text)
{ {
TFilename n = path; TFilename n = path;
if (n.blank()) if (n.blank())

15
ps/pd6342300.cpp
View File

@ -62,7 +62,7 @@ TRib_movanal_msk::TRib_movanal_msk() : TAnal_report_mask("pd6342300a")
class TCSV_recset : public TCSV_recordset class TCSV_recset : public TCSV_recordset
{ {
public: public:
bool save_as_html(const char* path); // bool save_as_html(const char* path);
TCSV_recset(TAssoc_array & calc); TCSV_recset(TAssoc_array & calc);
}; };
@ -92,7 +92,7 @@ TCSV_recset::TCSV_recset(TAssoc_array & calc) : TCSV_recordset("CSV(;)\n")
create_column("Key"); create_column("Key");
new_rec(""); new_rec("");
for (int i= 1; i < ncols; i++) for (int i= 1; i <= ncols; i++)
{ {
colname = colkeys.row(i - 1); colname = colkeys.row(i - 1);
colname.replace(',', ' '); colname.replace(',', ' ');
@ -111,7 +111,7 @@ TCSV_recset::TCSV_recset(TAssoc_array & calc) : TCSV_recordset("CSV(;)\n")
set(0, rowkey); set(0, rowkey);
if (row != NULL) if (row != NULL)
{ {
for (int j= 1; j < ncols; j++) for (int j= 1; j <= ncols; j++)
{ {
const real * val = (const real *) row->objptr(colkeys.row(j - 1)); const real * val = (const real *) row->objptr(colkeys.row(j - 1));
if (val != NULL) if (val != NULL)
@ -121,6 +121,8 @@ TCSV_recset::TCSV_recset(TAssoc_array & calc) : TCSV_recordset("CSV(;)\n")
} }
} }
/*
bool TCSV_recset::save_as_html(const char* path) bool TCSV_recset::save_as_html(const char* path)
{ {
TProgind pi(items(), TR("Esportazione in corso..."), true, true); TProgind pi(items(), TR("Esportazione in corso..."), true, true);
@ -233,7 +235,7 @@ bool TCSV_recset::save_as_html(const char* path)
return !pi.iscancelled(); return !pi.iscancelled();
} }
*/
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// APPLICAZIONE // APPLICAZIONE
//-------------------------------------------------------------------- //--------------------------------------------------------------------
@ -302,7 +304,6 @@ bool TRib_movanal_app::ripartizione(const TAnal_ripartizioni_batch& rrip, const
rowkey.add(rec.get(RMOVANA_CODCCOSTO)); rowkey.add(rec.get(RMOVANA_CODCCOSTO));
rowkey.add(rec.get(RMOVANA_CODCMS)); rowkey.add(rec.get(RMOVANA_CODCMS));
rowkey.add(rec.get(RMOVANA_CODFASE)); rowkey.add(rec.get(RMOVANA_CODFASE));
// rowkey.add(rec.get(RMOVANA_CODCONTO));
TToken_string browkey = rowkey; TToken_string browkey = rowkey;
TAssoc_array * row = (TAssoc_array *)_calc.objptr(rowkey); TAssoc_array * row = (TAssoc_array *)_calc.objptr(rowkey);
@ -317,7 +318,7 @@ bool TRib_movanal_app::ripartizione(const TAnal_ripartizioni_batch& rrip, const
*value = *value + (sez == 'D' ? importo : -importo); *value = *value + (sez == 'D' ? importo : -importo);
browkey.add("Rip"); browkey.add("+");
row = (TAssoc_array *)_calc.objptr(browkey); row = (TAssoc_array *)_calc.objptr(browkey);
if (row == NULL) if (row == NULL)
@ -612,7 +613,7 @@ void TRib_movanal_app::main_loop()
{ {
TCSV_recset recset(_calc); TCSV_recset recset(_calc);
recset.save_as_html(fname); recset.save_as(fname, fmt_unknown);
} }
} //if(run)... } //if(run)...
} }