Separzione tracciati step 1

git-svn-id: svn://10.65.10.50/trunk@3342 c028cbd2-c16b-5b4b-a496-9718f37d4682

ba/ba1100.cpp

@@ -39,8 +39,11 @@ struct direct
 class TManutenzione_app : public TApplication
 {
   TDir_sheet* _browse;
+  TArray _dirs;
+  TArray _recs;
   TMask* _mask;
   long _firm;
+  long _level;
   long _history_firm;
   TRec_sheet* _rec;
 
@@ -58,13 +61,14 @@ protected:
   virtual void print();
   virtual void do_print(TPrinter & p, TRec_sheet & r);
   const char* dumpfilename(const FileDes& dep) const;
+  void load_des();
   void open_history();
   void put_history(const char* firm);
   void close_history();
 
 public:
 
-  TManutenzione_app() : _browse(NULL), _rec(NULL), _mask(NULL), _firm(0) {}
+  TManutenzione_app() : _browse(NULL), _rec(NULL), _mask(NULL), _firm(0), _level(0) {}
 };
 
 HIDDEN void build_filelist(const char *path, TArray & list)
@@ -271,9 +275,9 @@ bool TManutenzione_app::create() // initvar e arrmask
   {
     if (!set_firm())
       return FALSE;
+   load_des();
 
    const bool superprassi = user() == "PRASSI";
-    
     _mask = new TMask ("ba1100a");
     _browse = new TDir_sheet ("Manutenzione file di sistema", superprassi ? 0xC : 0x8);
 
@@ -419,7 +423,7 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
   _mask->reset (FLD_EXTEND);
   _mask->reset (F_TAB);
 
-  const TRecnotype oldeox = atol(_mask->get(FLD_EOX));
+  const TRecnotype oldeox = _mask->get_long(FLD_EOX);
   const bool com = prefix().is_com() || !*prefix().name();
   const char* name = _mask->get(FLD_NOME);
   const bool enable_extend = (com ? *name != '$' : *name == '$') &&
@@ -457,7 +461,7 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
     dep.Flags = atol(_mask->get (FLD_FLAG));
     strcpy (dep.Des,_mask->get (FLD_DESC));
     strcpy (dep.FCalc,_mask->get (FLD_FORMULA));
-    const TRecnotype eox = atol(_mask->get(FLD_EOX));
+    const TRecnotype eox = _mask->get_bool(FLD_EXTEND) ? _mask->get_long(FLD_EOX) : oldeox;
 
     _browse->dir()->get(logicnum, _lock, _nordir, _sysdirop);
     _browse->dir()->set(dep.SysName, dep.EOD, dep.Flags,
@@ -581,21 +585,15 @@ void TManutenzione_app::update_dir()
   if (prefix().get_codditta() <= _history_firm)
     return;
 
-  prefix().set(""); 
+  const int orig_items = _dirs.last();
 
-    
-  TString desc(256), s(256);
   TDir d ;
-  d.get(LF_DIR);                 
-  const int orig_items = (int)d.eod();
-  
-  prefix().set(pref); 
 
   d.get(LF_DIR);
   const int items = (int)d.eod();
 
-  s = "Aggiornamento direttorio ";
+  TString80 s("Aggiornamento direttorio ");
-  if (is_com) s << "comune.";
+  if (is_com) s << "comune";
   else s << " della ditta " << atol (pref) <<".";
 #if XVT_OS == XVT_OS_WIN
   s << " Memoria libera: " << (long)GetFreeSpace(0)/1024 << " Kbytes.";
@@ -607,19 +605,22 @@ void TManutenzione_app::update_dir()
   for (int i = 2; i <= items; i++)
   {
     p.addstatus(1);
-    prefix().set("");                        
+//    prefix().set("");
-    d.get(i, _nolock, _nordir, _sysdirop);
+    const TDir & ds = (const TDir &) _dirs[i];
-    bool is_firm = d.is_firm();                 
+    const bool is_firm = ds.is_firm();
-    bool to_create = (is_com ? d.is_com() : d.is_firm());
+    const bool to_create = (is_com ? ds.is_com() : ds.is_firm());
-    desc = d.des();
+//    TString s(ds.name());
-    s = d.name();
+    TFilename fd(ds.filename());
+
     bool towrite = FALSE;
 
-    long flags = d.flags();
+//    long flags = ds.flags();
-    word len = d.len();
+//    word len = ds.len();
-    prefix().set(pref);
+//    prefix().set(pref);
     d.get(i);
-    if (!fexist(d.filename()))
+    TFilename fs(d.filename());
+
+    if (!fexist(fs))
     {
       if (d.eox() > 0L)
       {
@@ -632,7 +633,7 @@ void TManutenzione_app::update_dir()
     else
       if (i > 2)
       {
-        FILE * f = fopen(d.filename(), "r");
+        FILE * f = fopen(fs, "r");
         if (f != NULL)
         {
           fseek(f, 0L, SEEK_END);
@@ -673,25 +674,14 @@ void TManutenzione_app::update_dir()
     d.get(i, _nolock, _nordir, _sysdirop);
     if (to_create)
     {
-      TDir d1;
+/* non piu' necessario
-        
-      prefix().set(""); 
-      d1.get(i);
-        
-      TFilename fd(d1.name());
-
-      prefix().set(pref);
-      d1.get(i); 
-      TFilename fs(d1.name());
-        
-      fs.ext("dbf");
-      fd.ext("dbf");
      if (is_firm)
       {
         TString name(fd);
         fd.cut(0);
         fd << fs.path() << name;
       }
+*/
 
       if (fexist(fs) && (fd != fs))
       {
@@ -763,36 +753,38 @@ void TManutenzione_app::update_dir()
           ok = FALSE;
         if (ok)
         {
-          d.set(s, d.eox(), 0L, desc, d.expr()); 
+          d.set(s, d.eox(), 0L, ds.des(), d.expr());
           towrite = TRUE;
         }
       }
     }
     else
     {
-      towrite = (desc != d.des());
+      towrite = (TString(ds.des()) != d.des());
       if (towrite)
-        strcpy((char *) d.des(), desc);
+        strcpy((char *) d.des(), ds.des());
     }
     if (towrite)
       d.put(i, _nordir, _sysdirop);
-    d.get(i);
+//    d.get(i);
   }  // end of for scope
-  prefix().set(pref);
+//  prefix().set(pref);
 
   if (items >= orig_items) return;
 
   for (i = items + 1; i <= orig_items; i++)
   {
-    prefix().set(""); 
+//    prefix().set("");
-    d.get(i, _nolock, _nordir, _sysdirop);                 
+//    d.get(i, _nolock, _nordir, _sysdirop);
-    prefix().set(pref);
+//    prefix().set(pref);
-    d.set_len(0);      
+    TDir d1((TDir &) _dirs[i]);
-    d.eox() = 0;
+
-    d.flags() = 0L; 
+    d1.set_len(0);
-    d.put(i, _nordir, _sysdirop);                 
+    d1.eox() = 0;
+    d1.flags() = 0L;
+    d1.put(i, _nordir, _sysdirop);
   }
-  prefix().set(pref);
+//  prefix().set(pref);
   d.get(LF_DIR, _nolock, _nordir, _sysdirop);
   d.eod() = orig_items;
   if (d.eox() < d.eod())
@@ -806,7 +798,6 @@ void TManutenzione_app::convert_dir()
   const bool is_com = prefix().is_com();
 
   TDir d;
-  TTrec r;
 
   if (prefix().get_codditta() <= _history_firm)
     return;
@@ -829,14 +820,14 @@ void TManutenzione_app::convert_dir()
   for (int i = 2; i <= items; i++)
   {
     p.addstatus(1);
-    prefix().set(""); 
+//    prefix().set("");
-    r.get(i);                 
+    const TTrec & rs = (const TTrec &) _recs[i];
-    d.get(i);
+    const TDir & ds = (const TDir &) _dirs[i];
-    prefix().set(pref); 
+//    prefix().set(pref);
-    if (d.len() > 0)
+    if (ds.len() > 0)
     {
       TBaseisamfile b(i);
-      const int module = abs((int)d.flags());
+      const int module = abs((int)ds.flags());
       int err = b.is_valid();
       if (err == -60) err=NOERR;
       d.get(i, _nolock, _nordir, _sysdirop);
@@ -849,7 +840,7 @@ void TManutenzione_app::convert_dir()
 
       TSystemisamfile f(i);
 
-      f.update(r);         
+      f.update(rs);
       if (f.status() == 8) // cio' significa che e' accaduto quasi l'irreparabile...
       {
         {
@@ -869,8 +860,7 @@ void TManutenzione_app::convert_dir()
       if (to_create && has_module(module, CHK_DONGLE))
       {
         d.get(i);
-        TFilename s(d.name());
+        TFilename s(d.filename());
-        s.ext("dbf");
         if (!fexist(s))
         {
           TSystemisamfile f(i);
@@ -880,20 +870,88 @@ void TManutenzione_app::convert_dir()
     }
     else
     {
+      TTrec r(rs);
+
       r.zero();
       r.put(i);
     }
   }
-
+//  prefix().set(pref);
-  prefix().set(""); 
-  const long level = prefix().filelevel();
-  prefix().set(pref);
   d.get(LF_DIR, _nolock, _nordir, _sysdirop);
-  d.flags() = level; 
+  d.flags() = _level;
   d.put(LF_DIR, _nordir, _sysdirop);
   put_history(pref);
 }
 
+void TManutenzione_app::load_des()
+{
+  const TString pref(prefix().name());
+
+  _dirs.destroy();
+  _recs.destroy();
+  _level = prefix().filelevel();
+
+  TDir d;
+  TTrec r;
+
+  d.get(LF_DIR);
+  const int items = (int)d.eod();
+  const bool standard = pref.empty();
+
+  TString80 s("Caricamento descrizioni archivi ");
+
+  if (standard) s << "standard";
+  else
+    if (prefix().is_com()) s << "comuni";
+    else s << " della ditta " << atol (pref);
+
+  TProgind p(items ? items : 1, s, TRUE, TRUE, 70);
+
+  p.setstatus(1);
+  for (int i = 2; i <= items; i++)
+  {
+    p.addstatus(1);
+    d.get(i, _nolock, _nordir, _sysdirop);
+    r.get(i); 
+    if (standard)
+    {
+      TFilename desc_file;
+       
+      desc_file << DESCDIR << "/f" << i;
+      desc_file.ext("trr");
+      if (fexist(desc_file))
+      {
+        {
+          ifstream in(desc_file);
+          TFilename descfname;
+          
+          descfname.format("%s/d%d.des", DESCDIR, i);
+                           
+          if (!fexist(descfname))
+          {                           
+            FILE * fd = fopen(descfname, "w");
+            
+            if (fd != NULL)
+              fclose(fd);
+          }
+          
+          TConfig descr(descfname, DESCPAR);
+          
+          r.set_des(&descr);
+          in >> r;
+          r.put(i); 
+          d.set_len(r.len());
+          d.put(i, _nordir, _sysdirop);
+          r.set_des();
+        }             
+        remove(desc_file);
+      }
+    }
+    _dirs.add(d, i);
+    _recs.add(r, i);
+  }
+}
+
 void TManutenzione_app::update()
 {
   bool ok = TRUE;
@@ -939,12 +997,14 @@ void TManutenzione_app::update()
   do_events();
 
   begin_wait();
+  prefix().set("");
+  load_des();
   prefix().set("com");
-  if (prefix().filelevel() <= 199502L) 
+/*  if (prefix().filelevel() <= 199502L)
   {
     TExternal_app app("bacnv 4 0");
     app.run();
-  }
+  } */
 
   update_dir();
   convert_dir();
@@ -983,6 +1043,7 @@ void TManutenzione_app::update()
 
   if (firm > 0) set_firm(firm);
   else prefix().set(pref);
+  load_des();
 
   ok = FALSE;
   while (!ok)

ba/ba1101.cpp

@@ -166,14 +166,26 @@ HIDDEN bool len_handler(TMask_field& f, KEY key)
 }
 
 
+bool TRec_sheet::fld_notify(TSheet_field& f, int r, KEY k)
+{
+  if (k == K_CTRL + K_INS)
+  {                 
+    TToken_string & row = f.row(r);  
+    row.add("1", f.cid2index(FLD_TIPO));       
+  }    
+  return TRUE;
+}
+
 bool TRec_sheet::key_notify(TSheet_field& f, int r, KEY k)
 {
   if (k == K_INS)
   {                   
     const int items = f.items();
-    f.disable_cell(0, 1); 
     if (f.items() >= 8) return FALSE;
   }    
+  else
+    if (k = K_CTRL + K_INS)
+      f.enable_cell(r, 1, r > 0); 
   return TRUE;
 }
 
@@ -214,6 +226,7 @@ void TRec_sheet::edit()
   _mask->set (F_NUM, _dir->num());
   _mask->set (F_DES, _dir->des());
   f1.sheet_mask().field(FLD_LEN).set_handler(len_handler);
+  f1.set_notify(fld_notify);
   f1.set_append(FALSE);
   int nfields = _rec->fields();