From c96a1aefd1e5d2b4dfce575fa62a52cc02876640 Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 23 Sep 2016 15:41:17 +0000
Subject: [PATCH] Patch level         : 12.0 no-patch Files correlati     :
 Commento            : Aggiunto progress monitor ai TCursor e TSorted_cursor,
 da approvare.

git-svn-id: svn://10.65.10.50/branches/R_10_00@23318 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/include/relation.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/include/relation.cpp b/src/include/relation.cpp
index 73b89b02c..ac42adaa1 100755
--- a/src/include/relation.cpp
+++ b/src/include/relation.cpp
@@ -1118,8 +1118,14 @@ TRecnotype TCursor::buildcursor(TRecnotype rp)
   const bool filtered = has_filter();
   const bool simple_filter = filtered && has_simple_filter();
 
+	// Barra di +
+	TString msg("Elaborazione ");
+	msg << relation()->lfile().name();
+	TProgress_monitor pi(_if->lfile().items(), msg);
+
 	while (!DB_index_eof(fhnd))
-  {              
+  {
+		pi.add_status();
     const char *s0 = DB_index_getkey(fhnd);
     if (l && (strncmp(to(), s0, l) < 0)) 
       break;
@@ -1938,6 +1944,7 @@ TRecnotype  TSorted_cursor::buildcursor(TRecnotype rp)
   TSort sort(sizeof(El_To_Sort));
   
 	_order_expr.restart();
+
   while ((s=_order_expr.get()).not_empty())
   {
     check_expr(s); // Toglie l'eventuale operatore UPPER(), in modo che l'ultimo carattere
@@ -1980,8 +1987,14 @@ TRecnotype  TSorted_cursor::buildcursor(TRecnotype rp)
   pos = DB_index_recno(handle);
   TCursor::pos()=-1;           
   
+	// Barra di progressione
+	TString msg("Elaborazione ");
+	msg << relation()->lfile().name();
+	TProgress_monitor pi(relation()->lfile().items(), msg);
+
   while (!DB_index_eof(handle))
-  {              
+  {
+		pi.add_status();
     const char* s0 = DB_index_getkey(handle);
     if (l && (strncmp(to(), s0, l) < 0)) 
       break;