From 3ffa11808802ba7fe98e7906d5f214327d65d98f Mon Sep 17 00:00:00 2001 From: Mattia Tollari Date: Thu, 27 Jun 2019 14:59:25 +0200 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?0=20no-patch=20Files=20correlati=20=20=20=20=20:=20fp0=20Commen?= =?UTF-8?q?to=20=20=20=20=20=20=20=20=20=20=20=20:=20-=20Aggiunti=20altri?= =?UTF-8?q?=20file=20in=20apertura=20per=20invio=20fatturazione=20elettron?= =?UTF-8?q?ica=20-=20Divisa=20funzione=20extract=5Finfo=20per=20read=20e?= =?UTF-8?q?=20search=20-=20Aggiunta=20possibilit=C3=A0=20di=20selezionare?= =?UTF-8?q?=20la=20chiave=20durante=20la=20search=20-=20Aggiunte=20tabelle?= =?UTF-8?q?=20%NUM=20e=20%CPG=20nella=20read?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fp/fp0300.cpp | 5 ++-- src/fp/fplib.h | 3 +- src/fp/fplib01.cpp | 2 ++ src/fp/fplib05.cpp | 74 +++++++++++++++++++++++++++++++++------------- 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/src/fp/fp0300.cpp b/src/fp/fp0300.cpp index d0e0d28d8..671cc674d 100644 --- a/src/fp/fp0300.cpp +++ b/src/fp/fp0300.cpp @@ -743,14 +743,13 @@ bool TDoc2Paf::create() { open_files(LF_TAB, LF_TABCOM, LF_TABMOD, LF_ANAG, LF_CLIFO, LF_CFVEN, LF_CFBAN, LF_NDITTE, - LF_DOC, LF_RIGHEDOC, 0); + LF_DOC, LF_RIGHEDOC, LF_CODCORR, LF_ANAMAG, 0); - TRectype cfven(LF_CFVEN); + const TRectype cfven(LF_CFVEN); if (cfven.length(CFV_PADESTIN) != 7) // Nuova lunghezza per privati return error_box(TR("Database non convertito per fatturazione F.P.")); return check_tables() && TSkeleton_application::create(); - } bool TDoc2Paf::destroy() diff --git a/src/fp/fplib.h b/src/fp/fplib.h index 146f2fba3..b1e5f26df 100644 --- a/src/fp/fplib.h +++ b/src/fp/fplib.h @@ -389,7 +389,8 @@ private: enum TFP_operator { error, eq, neq, gt, ls, gteq, lseq, and, or }; // Etrattori - static void extract_info(const TString& expr, TString& tabella, TString& campo, TToken_string* search); + static void extract_info(const TString& expr, TString& tabella, TString& campo); + static void extract_info(const TString& expr, TString& tabella, TString& campo, TToken_string& search, int& key); static bool calc_table(const TString& tabella, int& file); static void split_condition(const TString& cond, TString& cond_sx, TString& cond_dx, TFP_operator& symb); static TVariant& get_value(const TRectype& rec, const TString& campo); diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp index 6d9a64aff..dcf5b75d0 100644 --- a/src/fp/fplib01.cpp +++ b/src/fp/fplib01.cpp @@ -51,6 +51,7 @@ bool set_connection(SSimple_query& s) #endif return ok; } + SSimple_query& fp_db() { static SSimple_query* db = nullptr; @@ -63,6 +64,7 @@ SSimple_query& fp_db() } return *db; } + bool run_fp_psw_mask() { static TMask* m; diff --git a/src/fp/fplib05.cpp b/src/fp/fplib05.cpp index 672fbd1e8..c486b54a0 100644 --- a/src/fp/fplib05.cpp +++ b/src/fp/fplib05.cpp @@ -255,8 +255,6 @@ TFP_custom_cache::TFP_custom_cache() } } - - /****************************************************************************** * TFP_expression *******************************************************************************/ @@ -364,7 +362,7 @@ bool TFP_expression::check_condition(const TString& cond, TRiga_documento& rdoc) } } -void TFP_expression::extract_info(const TString& expr, TString& tabella, TString& campo, TToken_string* search) +void TFP_expression::extract_info(const TString& expr, TString& tabella, TString& campo) { // Prendo la stringa pulita della parte sinistra TString clean_expr = expr.mid(expr.find('(') + 1); @@ -377,13 +375,38 @@ void TFP_expression::extract_info(const TString& expr, TString& tabella, TString // Trimmare sempre come se non sapessi fare altro nella vita tabella.cut(0) << info.remove(0); tabella.trim(); campo.cut(0) << info.remove(0); campo.trim(); - if (search != nullptr) +} + + +void TFP_expression::extract_info(const TString& expr, TString& tabella, TString& campo, TToken_string& search, int& key) +{ + // Prendo la stringa pulita della parte sinistra + TString clean_expr = expr.mid(expr.find('(') + 1); + // Tolgo eventuali spazi ai lati + clean_expr.trim(); + // Tolgo la virgola finale + clean_expr.rtrim(1); + TToken_string info(clean_expr, ','); + + // Trimmare sempre come se non sapessi fare altro nella vita + tabella.cut(0) << info.remove(0); tabella.trim(); + if(tabella.contains('.')) { - // Prendo il resto - search->cut(0) << info; - search->trim(); - search->restart(); + TToken_string app(tabella, '.'); + tabella = app.get(); + key = atoi(app.get()); } + else + { + key = 1; + } + + campo.cut(0) << info.remove(0); campo.trim(); + + // Prendo il resto e lo devolvo nella ricerca + search.cut(0) << info; + search.trim(); + search.restart(); } bool TFP_expression::calc_table(const TString& tabella, int& file) @@ -549,17 +572,26 @@ TVariant& TFP_expression::parse_var(const TString& str) TVariant& TFP_expression::parse_read(const TString& str, TRiga_documento& rdoc) { TString tabella, campo; - extract_info(str, tabella, campo, nullptr); + extract_info(str, tabella, campo); return do_read(tabella, campo, rdoc); } TVariant& TFP_expression::do_read(const TString& tabella, const TString& campo, TRiga_documento& rdoc) { - + const TDocumento& doc = rdoc.doc(); // Prima di tutto controllo se è una delle tabelle multitracciato che supporto if(tabella == "%TIP") { - return get_value(rdoc.doc().tipo(), campo); + return get_value(doc.tipo(), campo); + } + if(tabella == "%NUM") + { + return get_value(doc.codice_numerazione(), campo); + } + + if(tabella == "%CPG") + { + return get_value(cache().get("%CPG", doc.get(DOC_CODPAG)), campo); } int file; @@ -568,17 +600,19 @@ TVariant& TFP_expression::do_read(const TString& tabella, const TString& campo, switch (file) { case LF_DOC: - return get_value(rdoc.doc(), campo); + return get_value(doc, campo); case LF_RIGHEDOC: return get_value(rdoc, campo); case LF_CLIFO: - return get_value(rdoc.doc().clifor(), campo); + return get_value(doc.clifor(), campo); case LF_CFVEN: - return get_value(rdoc.doc().clifor().vendite(), campo); + return get_value(doc.clifor().vendite(), campo); case LF_LETINT: - return get_value(rdoc.doc().clifor().lettera(), campo); + return get_value(doc.clifor().lettera(), campo); case LF_ANAMAG: return get_value(rdoc.articolo(), campo); + case LF_CODCORR: + return get_value(cache().get(LF_CODCORR, rdoc.articolo().codice()), campo); default: static TVariant null_var(EMPTY_STRING); return null_var; @@ -588,10 +622,10 @@ TVariant& TFP_expression::do_read(const TString& tabella, const TString& campo, TVariant& TFP_expression::parse_search(const TString& str, TRiga_documento& rdoc) { TString tabella, campo; - TToken_string input_search, search; - int file; + TToken_string input_search("", ';'), search; + int file, key; - extract_info(str, tabella, campo, &input_search); + extract_info(str, tabella, campo, input_search, key); const bool multi_table = calc_table(tabella, file); // Parso ogni singolo token della ricerca @@ -602,10 +636,10 @@ TVariant& TFP_expression::parse_search(const TString& str, TRiga_documento& rdoc if (multi_table) { - return get_value(cache().get(tabella, search), campo); + return get_value(cache().get(tabella, search, key), campo); } else { - return get_value(cache().get(file, search), campo); + return get_value(cache().get(file, search, key), campo); } }