[us-commits] r2773 - in trunk: programs/us_xpn_viewer sql

[svn at svn.aucsolutions.com]

Author: alexey
Date: 2019-05-21 15:27:52 +0000 (Tue, 21 May 2019)
New Revision: 2773

Modified:
   trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
   trunk/sql/us3_autoflow_procs.sql
Log:
small upds. on autoflow



Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
===================================================================
--- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-21 01:07:00 UTC (rev 2772)
+++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-21 15:27:52 UTC (rev 2773)
@@ -2119,7 +2119,7 @@
  qDebug() << "RDr:     iRId" << iRunId << "sMsks scnmask" << sMasks << scanmask;
 
  //ALEXEY: maybe put in_reload_check_sysdata = true; and then false (after xpn_data->import_data( iRunId, scanmask ); )
- in_reload_check_sysdata = true; //ALEXEY
+ //in_reload_check_sysdata = true; //ALEXEY
  xpn_data->import_data( iRunId, scanmask );                               // ALEXEY <-- actual data retreiving
    int ntsrows        = xpn_data->countOf( "scan_rows" );
 DbgLv(1) << "RDr:     ntsrows" << ntsrows;
@@ -2137,7 +2137,7 @@
 
    le_status->setText( tr( "Initial Raw Optima data import complete." ) );
    qApp->processEvents();
-   in_reload_check_sysdata = false; //ALEXEY
+   //in_reload_check_sysdata = false; //ALEXEY
    
 double tm1=(double)sttime.msecsTo(QDateTime::currentDateTime())/1000.0;
    QStringList opsys;

Modified: trunk/sql/us3_autoflow_procs.sql
===================================================================
--- trunk/sql/us3_autoflow_procs.sql	2019-05-21 01:07:00 UTC (rev 2772)
+++ trunk/sql/us3_autoflow_procs.sql	2019-05-21 15:27:52 UTC (rev 2773)
@@ -262,7 +262,7 @@
   SELECT     COUNT(*)
   INTO       count_records
   FROM       autoflow
-  WHERE      runID = p_runID AND status = 'LIVE_UPDATE';
+  WHERE      runID = p_runID;
 
   IF ( verify_user( p_personGUID, p_password ) = @OK ) THEN
     IF ( count_records = 0 ) THEN
@@ -272,7 +272,7 @@
     ELSE
       UPDATE   autoflow
       SET      dataPath = p_curDir, status = 'EDITING'
-      WHERE    runID = p_runID AND status = 'LIVE_UPDATE';
+      WHERE    runID = p_runID;
 
     END IF;