From 9b5bca12ceea34e7729694fe712d603bc92597a6 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Wed, 25 Feb 2009 16:08:18 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?=
 =?UTF-8?q?=20250=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20D?=
 =?UTF-8?q?emo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:?=
 =?UTF-8?q?=200001155:=20La=20ricerca=20file=20archiviati=20=C3=A8=20rimas?=
 =?UTF-8?q?ta=20nel=20look=203.2=20Descrizione=20=20La=20ricerca=20file=20?=
 =?UTF-8?q?archiviati=20=C3=A8=20rimasta=20nel=20look=203.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/trunk@18355 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba8600.cpp  | 40 ++++++++++++++++++++++------------------
 ba/ba8600a.h   |  1 +
 ba/ba8600a.uml | 20 +++++++++++---------
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/ba/ba8600.cpp b/ba/ba8600.cpp
index 163310806..904711736 100755
--- a/ba/ba8600.cpp
+++ b/ba/ba8600.cpp
@@ -82,28 +82,30 @@ void TGoogle_mask::query_firm(int anno, long firm)
 
   xvt_fsys_save_dir();
   DIRECTORY dir; xvt_fsys_convert_str_to_dir(name, &dir);
-  xvt_fsys_set_dir(&dir);
+  if (xvt_fsys_set_dir(&dir))
+  {
+    SLIST files = xvt_fsys_list_files("", "*.*", FALSE);
+    for (SLIST_ELT e = xvt_slist_get_first(files); e; e = xvt_slist_get_next(files, e))
+    { 
+      TToken_string file(xvt_slist_get(files, e, NULL), '_');
+      if (file.items() < 3)
+        continue;
 
-  SLIST files = xvt_fsys_list_files("", "*.*", FALSE);
-  for (SLIST_ELT e = xvt_slist_get_first(files); e; e = xvt_slist_get_next(files, e))
-  { 
-    TToken_string file(xvt_slist_get(files, e, NULL), '_');
-    if (file.items() < 3)
-      continue;
+      if (tipodoc.full() && tipodoc.compare(file.get(1), -1, true) != 0)
+        continue;
 
-    if (tipodoc.full() && tipodoc.compare(file.get(1), -1, true) != 0)
-      continue;
+      if (codcf > 0 && codcf != file.get_long(3))
+        continue;
 
-    if (codcf > 0 && codcf != file.get_long(3))
-      continue;
-
-    TToken_string& row = sheet.row(-1);
-    row.add(firm);
-    row.add(anno);
-    row.add(file);
+      TToken_string& row = sheet.row(-1);
+      row.add(firm);
+      row.add(anno);
+      row.add(file);
+    }
+    xvt_slist_destroy(files);
   }
-  xvt_slist_destroy(files);
-
+  else
+    error_box("Ma che cavolo di cartella %s stai guardando Willis?", (const char*) name);
   xvt_fsys_restore_dir();
 }
 
@@ -167,6 +169,8 @@ TGoogle_mask::TGoogle_mask(const TFilename& base_dir)
   TSheet_field::set_line_number_width(7);
   read_mask("ba8600a", 0, 1);
   set_handlers();
+
+  set(F_STUDIO, firm2dir(-1));
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/ba/ba8600a.h b/ba/ba8600a.h
index 8ea7d0f56..3d07035ba 100755
--- a/ba/ba8600a.h
+++ b/ba/ba8600a.h
@@ -5,4 +5,5 @@
 #define F_TIPOCF     205
 #define F_CLIFO      206
 #define F_CLIRAGSOC  207
+#define F_STUDIO     208
 #define F_SHEET      300
diff --git a/ba/ba8600a.uml b/ba/ba8600a.uml
index 149214616..ff31fcbca 100755
--- a/ba/ba8600a.uml
+++ b/ba/ba8600a.uml
@@ -1,21 +1,23 @@
 #include "ba8600a.h"
 
-TOOLBAR "Toolbar" 0 -2 0 2
+TOOLBAR "topbar" 0 0 0 2
 
-BUTTON DLG_ELABORA 10 2
+BUTTON DLG_ELABORA
 BEGIN
-  PROMPT -12 -11 "~Elabora"
+  PROMPT -1 -1 "~Elabora"
   PICTURE BMP_ELABORA
 END
 
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -11 ""
-END
-
+#include <helpbar.h>
 ENDPAGE
 
-PAGE "Ricerca documenti" 0 0 0 -2
+PAGE "Ricerca documenti" 0 2 0 0
+
+STRING F_STUDIO 256 78
+BEGIN
+  PROMPT 1 0 "Studio "
+  FLAGS "D"
+END
 
 NUMBER F_DITTA 5
 BEGIN