From 691cb291a51338d6baf055eb88662a64aef43800 Mon Sep 17 00:00:00 2001
From: cris <cris@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 2 Feb 1999 14:49:25 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            : Corretto stampa localita

git-svn-id: svn://10.65.10.50/trunk@7744 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 at/at4200.cpp | 11 +++--------
 at/at5200.cpp | 15 ++++-----------
 at/at5300.cpp | 15 ++++-----------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/at/at4200.cpp b/at/at4200.cpp
index 8cd7285d5..2dffbc61b 100755
--- a/at/at4200.cpp
+++ b/at/at4200.cpp
@@ -222,18 +222,13 @@ bool TStampaUrgenze::preprocess_page(int file, int counter)
 		nome << recsog.get(SOG_NOME);
 		_cognome_nome = nome;
 		TString256 localita = "";
-		localita << current_cursor()->curr(-ALIAS_LCP).get("S6");
-		if (localita.not_empty() && localita.ok())
+		localita = recsog.get(SOG_DOM_CAP);			
+		localita << ' ';
+		if (recsog.get(SOG_DOM_CODLOC).not_empty())
 		{
-			localita << " ";
 			localita << current_cursor()->curr(-ALIAS_LCP).get("S0");
 			localita << " - ";		
 		}
-		else
-		{
-			localita = current_cursor()->curr(LF_COMUNI).get(COM_CAPCOM);
-			localita << " ";
-		}			
 		localita << current_cursor()->curr(LF_COMUNI).get(COM_DENCOM);
 		localita.trim();
 		_dencom = localita;
diff --git a/at/at5200.cpp b/at/at5200.cpp
index 1a07137db..4adc0cce6 100755
--- a/at/at5200.cpp
+++ b/at/at5200.cpp
@@ -156,24 +156,17 @@ bool TSitSanitaria::preprocess_page(int file, int counter)
 		nome << recsog.get(SOG_NOME);
 		_cognome_nome = nome;
 		TString256 localita = "";
-		localita << current_cursor()->curr(-ALIAS_LCPDOM).get("S6");
-		if (localita.not_empty() && localita.ok())
+		localita = recsog.get(SOG_DOM_CAP);			
+		localita << ' ';
+		if (recsog.get(SOG_DOM_CODLOC).not_empty())
 		{
-			localita << " ";
 			localita << current_cursor()->curr(-ALIAS_LCPDOM).get("S0");
 			localita << " - ";		
 		}
-		else
-		{
-			localita = current_cursor()->curr(-ALIAS_COMDOM).get(COM_CAPCOM);
-			localita << " ";
-		}			
-		localita << current_cursor()->curr(-ALIAS_COMDOM).get(COM_DENCOM);
+		localita << current_cursor()->curr(LF_COMUNI).get(COM_DENCOM);
 		localita.trim();
 		_dencom = localita;
-		
 		TDate data1(NULLDATE), data2(NULLDATE), data3(NULLDATE), data4(NULLDATE), data5(NULLDATE);
-		
 		TRectype* key = new TRectype(LF_CONTSAN);
 		long codice = recsog.get_long(SOG_CODICE);
 		key->put(CON_CODICE, codice);
diff --git a/at/at5300.cpp b/at/at5300.cpp
index d75667168..8e3d3ebb5 100755
--- a/at/at5300.cpp
+++ b/at/at5300.cpp
@@ -157,24 +157,17 @@ bool TTurniControlli::preprocess_page(int file, int counter)
 		nome << recsog.get(SOG_NOME);
 		_cognome_nome = nome;
 		TString256 localita = "";
-		localita << current_cursor()->curr(-ALIAS_LCPDOM).get("S6");
-		if (localita.not_empty() && localita.ok())
+		localita = recsog.get(SOG_DOM_CAP);			
+		localita << ' ';
+		if (recsog.get(SOG_DOM_CODLOC).not_empty())
 		{
-			localita << " ";
 			localita << current_cursor()->curr(-ALIAS_LCPDOM).get("S0");
 			localita << " - ";		
 		}
-		else
-		{
-			localita = current_cursor()->curr(-ALIAS_COMDOM).get(COM_CAPCOM);
-			localita << " ";
-		}			
-		localita << current_cursor()->curr(-ALIAS_COMDOM).get(COM_DENCOM);
+		localita << current_cursor()->curr(LF_COMUNI).get(COM_DENCOM);
 		localita.trim();
 		_dencom = localita;
-		
 		TDate data1(NULLDATE);
-		
 		TRectype* key = new TRectype(LF_CONTSAN);
 		long codice = recsog.get_long(SOG_CODICE);
 		key->put(CON_CODICE, codice);