From f06705abc0cbc696ca5b9517903fc4612a7a5ae6 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 18 Mar 2009 16:48:49 +0000
Subject: [PATCH] Patch level         : 10.0 262 Files correlati     : ba8.exe
 Ricompilazione Demo : [ ] Commento            : Eliminati $ e % dai nomi
 delle tabelle nel generatore di query

git-svn-id: svn://10.65.10.50/trunk@18559 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba8200.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ba/ba8200.cpp b/ba/ba8200.cpp
index fa7bbd0f0..5b9348002 100755
--- a/ba/ba8200.cpp
+++ b/ba/ba8200.cpp
@@ -63,8 +63,7 @@ void TRelation_node::set_num(int num)
 {
   _logicnum = num;
   const FileDes& fd = prefix().get_filedes(_logicnum);
-  const TFilename name = fd.SysName;
-  _name = name.name(); _name.upper();
+  _name = fd.SysName; _name.strip("$%"); _name.upper();
 }
 
 TRelation_node::TRelation_node(const TRelation_node* father, int ln, const char* alias)
@@ -256,21 +255,22 @@ void TTable_mask::mask2node(TRelation_node& son)
 
 TTable_mask::TTable_mask() : TAutomask("ba8200b")
 { 
-  FileDes dir;
-  CGetFile(LF_DIR, &dir, _nolock, NORDIR);
-  const int nfiles = (int)dir.EOD;
+  const TDir dir(LF_DIR);
+  const int nfiles = (int)dir.eod();
 
   TList_sheet& sht = *efield(F_SON).sheet();
   TToken_string tt(80);
-  TFilename n;
   for (int logic = LF_USER; logic < nfiles; logic++)
   {     
     const FileDes& fd = prefix().get_filedes(logic);
-    n = fd.SysName; n = n.name(); n.upper();
-    tt = n;
-    tt.add(logic);
-    tt.add(fd.Des);
-    sht.rows_array().add(tt);
+    tt = fd.SysName; 
+    if (tt.full())
+    {
+      tt.strip("$%"); tt.upper();
+      tt.add(logic);
+      tt.add(fd.Des);
+      sht.rows_array().add(tt);
+    }
   }
   sht.rows_array().sort();
 }