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

Patch level :4.0 802

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :aggiunte modifiche per il caricamento patch a 4 cifre! speriamo non servano mai!


git-svn-id: svn://10.65.10.50/trunk@15710 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-10-15 10:01:44 +00:00
parent 47c44b0e0f
commit 04bd445c84
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ba/ba1600.cpp
View File

@ -1933,7 +1933,7 @@ bool TFascicolator_mask::set_version_info(const TFilename& filename,
int year, release, tag, patch, checksum; int year, release, tag, patch, checksum;
ini.version_info(module, year, release, tag, patch); ini.version_info(module, year, release, tag, patch);
checksum = year + release + tag + patch; checksum = year + release + tag + patch;
str.format("%04d.%02d.%02d.%03d.%04d", year, release, tag, patch, checksum); str.format("%04d.%02d.%02d.%04d.%04d", year, release, tag, patch, checksum);
TString oldfirm("XXXX.XX.XX.XXX.XXXX"); TString oldfirm("XXXX.XX.XX.XXX.XXXX");
outfile.read(oldfirm.get_buffer(),19); outfile.read(oldfirm.get_buffer(),19);

2
ba/ba1600a.uml
View File

@ -67,7 +67,7 @@ BEGIN
PROMPT 1 2 "Versione " PROMPT 1 2 "Versione "
END END
STRING S_PATCHLEVEL 3 STRING S_PATCHLEVEL 4
BEGIN BEGIN
PROMPT 20 2 "Patch " PROMPT 20 2 "Patch "
FLAGS "Z" FLAGS "Z"

12
ba/ba1700.cpp
View File

@ -164,7 +164,7 @@ bool TInstaller_mask::add_module(TConfig& ini, const TString& module, bool patch
const int numpatch = ini.get_int("Patch"); const int numpatch = ini.get_int("Patch");
TString4 strpatch; TString4 strpatch;
if (numpatch > 0) if (numpatch > 0)
strpatch.format("%03d", numpatch); strpatch.format("%04d", numpatch);
TToken_string row; TToken_string row;
row = " "; // Not selected row = " "; // Not selected
@ -327,7 +327,7 @@ void TInstaller_mask::update_version()
const TString16 oldver = ini.get("Versione"); const TString16 oldver = ini.get("Versione");
const int numpatch = ini.get_int("Patch"); const int numpatch = ini.get_int("Patch");
TString16 strpatch; TString16 strpatch;
if (numpatch > 0) strpatch.format("%03d", numpatch); if (numpatch > 0) strpatch.format("%04d", numpatch);
row->add(oldver, C_CURRRELEASE); row->add(oldver, C_CURRRELEASE);
row->add(strpatch, C_CURRPATCH); row->add(strpatch, C_CURRPATCH);
row->add(ini.get("Data"), C_CURRDATAREL); row->add(ini.get("Data"), C_CURRDATAREL);
@ -456,7 +456,7 @@ bool TInstaller_mask::autoload()
for (int i = modules.last(); i >= 0; i--) for (int i = modules.last(); i >= 0; i--)
{ {
TString& str = modules.row(i); TString& str = modules.row(i);
if (str.match("??0???A.INI") || str.match("??0???a.ini")) if (str.match("??????A.INI") || str.match("??????a.ini"))
{ {
TFilename remote = http_path; TFilename remote = http_path;
remote << str; remote << str;
@ -479,7 +479,7 @@ bool TInstaller_mask::autoload()
else //normal patches else //normal patches
{ {
ininame = path; ininame = path;
ininame.add("??0???a.ini"); ininame.add("??????a.ini");
list_files(ininame, modules); list_files(ininame, modules);
} }
@ -534,7 +534,7 @@ bool TInstaller_mask::autoload()
if (patchversion.mid(4) == release.mid(4) // se le versioni corrispondono ... if (patchversion.mid(4) == release.mid(4) // se le versioni corrispondono ...
&& patchlevel > row.get_int(C_PATCH)) // ..e il patchlevel è superiore && patchlevel > row.get_int(C_PATCH)) // ..e il patchlevel è superiore
{ {
TString16 patch; patch.format("%03d", patchlevel); //aggiunge zeri per avere 3 cifre sempre TString16 patch; patch.format("%04d", patchlevel); //aggiunge zeri per avere 3 cifre sempre
if (*row.get(C_ISPATCH)<=' ') // se era un modulo ... if (*row.get(C_ISPATCH)<=' ') // se era un modulo ...
{ {
row.add("+", C_ISPATCH); // .....setta la presenza di patches row.add("+", C_ISPATCH); // .....setta la presenza di patches
@ -1216,7 +1216,7 @@ bool TInstaller_mask::install_patches(const TString& module, const TString& last
get_internet_path(ininame); get_internet_path(ininame);
ininame.add(module); ininame.add(module);
ininame << "0???a.ini"; ininame << "????a.ini";
modules.destroy(); modules.destroy();
list_files(ininame, modules); list_files(ininame, modules);
modules.sort(); modules.sort();