From 03e0d81fd36ed22f7eef89da3be18ba5df2e02ba Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 14 Oct 2011 10:41:10 +0000 Subject: [PATCH] Patch level : ha1112 Files correlati : ha1.exe Ricompilazione Demo : [ ] Commento : Ignorato file upload.d in favore dei soli file con data ed ora nel suffisso git-svn-id: svn://10.65.10.50/branches/R_10_00@22455 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ha/ha1300.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ha/ha1300.cpp b/ha/ha1300.cpp index 0fb8b8e10..57a4a0a58 100755 --- a/ha/ha1300.cpp +++ b/ha/ha1300.cpp @@ -1360,8 +1360,15 @@ void TUpload2Campo::elabora(const TMask& mask, TLog_report& log) //una volta si importavano tutti i files di tipo upload*.d; poi si è passati ad importare solo upload.d e basta! src_files.add("upload.d*"); TString_array src_files_list; - const int n_files_d = list_files(src_files, src_files_list); - src_files_list.TArray::sort(upload_cmp, NULL); + + int n_files_d = list_files(src_files, src_files_list); + if (n_files_d > 0) + { + src_files_list.TArray::sort(upload_cmp, NULL); + const TString& u = src_files_list.row(n_files_d-1); + if (u.ends_with(".d", true)) // Ignoro upload.d in quanto duplicato nell'ultimo upload.dGG_MM_AAAA_hh_mm_ss + n_files_d--; + } TProgind pi(n_files_d, TR("Acquisizione files in corso..."), true, true);