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

Patch level : 2.1 086

Browse Source 
Files correlati     : ve1.exe ba8.exe
Ricompilazione Demo : [ ]
Commento            :
Il riconoscimento dell'ID dei Campi non funziona più (#XX) causando quindi problemi anche sul MESSAGE _STREXPR o _NUMEXPR

Codice : AO21022


git-svn-id: svn://10.65.10.50/trunk@12240 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-07-13 11:29:16 +00:00
parent 206234636c
commit ed595d7575
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fraction.cpp
View File

@ -168,13 +168,16 @@ fraction::fraction(const fraction& b)
fraction::fraction(const real& num, const real& den) fraction::fraction(const real& num, const real& den)
{ {
if (den == UNO) if (den == ZERO)
build_fraction(num.stringa()); build_fraction("");
else else
{ if (den == UNO)
real n = num; n /= den; build_fraction(num.stringa());
build_fraction(n.stringa()); else
} {
real n = num; n /= den;
build_fraction(n.stringa());
}
} }
int fraction::sign() const int fraction::sign() const

9
include/real.cpp
View File

@ -1585,8 +1585,13 @@ const char* real::string(const char *picture) const
// Certified 50% // Certified 50%
const char* real::format(const char *picture) const const char* real::format(const char *picture) const
{ {
fatal_box("NOT IMPLEMENTED"); if (*picture == '\0')
return picture; return string ();
TString& f = get_tmp_string();
dsprintf (f.get_buffer(), (char*)(const char*)picture, ptr());
return (const char *) f;
} }
// Certified 99% // Certified 99%

9
include/report.cpp
View File

@ -474,6 +474,8 @@ bool TReport_section::load_fields()
for (int i = 0; i < items(); i++) for (int i = 0; i < items(); i++)
{ {
TReport_field& f = field(i); TReport_field& f = field(i);
report().set_curr_field(&f);
f.load_field(); f.load_field();
} }
} }
@ -1729,8 +1731,11 @@ bool TReport::evaluate(const char* expr, TVariant& var, TFieldtypes force_type)
var = name; var = name;
if (var.is_string()) if (var.is_string())
e.setvar(i, var.as_string()); e.setvar(i, var.as_string());
else else
e.setvar(i, var.as_real()); if (var.is_date())
e.setvar(i, var.as_date().string());
else
e.setvar(i, var.as_real());
} }
const TFieldtypes ft = force_type != _nullfld ? force_type : var.type(); const TFieldtypes ft = force_type != _nullfld ? force_type : var.type();

1
include/variant.h
View File

@ -29,6 +29,7 @@ protected:
public: public:
TFieldtypes type() const { return _type; } // Internal use only TFieldtypes type() const { return _type; } // Internal use only
bool is_string() const { return _type == _alfafld; } bool is_string() const { return _type == _alfafld; }
bool is_date() const { return _type == _datefld; }
bool is_empty() const; bool is_empty() const;
bool is_null() const { return _type == _nullfld; } bool is_null() const { return _type == _nullfld; }
bool is_zero() const; bool is_zero() const;

2
ve/ve1300.cpp
View File

@ -48,6 +48,8 @@ TRiga_documento& TDoc_recordset::riga_doc(int n) const
n = _mypos+1; n = _mypos+1;
if (n > _doc->rows()) if (n > _doc->rows())
n = _doc->new_row().get_int(RDOC_NRIGA); n = _doc->new_row().get_int(RDOC_NRIGA);
if (n <= 0)
n = 1;
return (*_doc)[n]; return (*_doc)[n];
} }