Changeset 696 in ntrip for trunk

Timestamp:

Feb 20, 2008, 3:58:50 PM (17 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (4 diffs)
• bncgetthread.h (modified) (1 diff)
• bnchelp.html (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -483 +483 @@
             // ---------------------
             if ( begCorrupt && !endCorrupt && secSucc > _adviseReco * 60 ) {
+              _endDateCor = QDateTime::currentDateTime().toUTC().date().toString("dd-MM-yy");
+              _endTimeCor = QDateTime::currentDateTime().toUTC().time().toString("hh:mm:ss");
               emit(newMessage(_staID + ": Corrupted recovery threshold exceeded"));
-              callScript("End_Corrupted");
+              callScript(("End_Corrupted " + _endDateCor + " " + _endTimeCor + " Begin was " + _begDateCor + " " + _begTimeCor).toAscii());
               endCorrupt = true;
               begCorrupt = false;
@@ -494 +496 @@
               // -----------------------
               if ( !begCorrupt && secFail > _adviseFail * 60 ) {
+                _begDateCor = QDateTime::currentDateTime().toUTC().date().toString("dd-MM-yy");
+                _begTimeCor = QDateTime::currentDateTime().toUTC().time().toString("hh:mm:ss");
                 emit(newMessage(_staID + ": Corrupted failure threshold exceeded"));
-                callScript("Begin_Corrupted");
+                callScript(("Begin_Corrupted " + _begDateCor + " " + _begTimeCor).toAscii());
                 begCorrupt = true;
                 endCorrupt = false;
@@ -513 +517 @@
         _decodeStart.setTime(QTime());
         if (_inspSegm>0) {
+          _endDateOut = QDateTime::currentDateTime().toUTC().date().toString("dd-MM-yy");
+          _endTimeOut = QDateTime::currentDateTime().toUTC().time().toString("hh:mm:ss");
           emit(newMessage(_staID + ": Outage recovery threshold exceeded"));
-          callScript("End_Outage");
+          callScript(("End_Outage " + _endDateOut + " " + _endTimeOut + " Begin was " + _begDateOut + " " + _begTimeOut).toAscii());
         }
       }
@@ -619 +625 @@
         _decodeStop.setTime(QTime());
         if (_inspSegm>0) {
+          _begDateOut = QDateTime::currentDateTime().toUTC().date().toString("dd-MM-yy");
+          _begTimeOut = QDateTime::currentDateTime().toUTC().time().toString("hh:mm:ss");
           emit(newMessage(_staID + ": Outage failure threshold exceeded"));
-          callScript("Begin_Outage");
+          callScript(("Begin_Outage " + _begDateOut + " " + _begTimeOut).toAscii());
         }
       }

trunk/BNC/bncgetthread.h

@@ -76 +76 @@
    QByteArray  _nmea;
    QString     _adviseScript;
+   QString     _begDateCor;
+   QString     _begTimeCor;
+   QString     _begDateOut;
+   QString     _begTimeOut;
+   QString     _endDateCor;
+   QString     _endTimeCor;
+   QString     _endDateOut;
+   QString     _endTimeOut;
    int         _obsRate;
    int         _inspSegm;

trunk/BNC/bnchelp.html

@@ -411 +411 @@
 <p><a name="advscript"><h4>3.8.4 Advisory Script - optional </h4></p>
 <p>
-As mentioned previously, BNC can trigger a shell script or a batch file to be executed when one of the events described are reported. This script can be used to email an advisory note to network operator or stream providers. To enable this feature, specify the full path to the script or batch file in the 'Script' field. The affected mountpoint and type of event reported ('Begin_Outage', 'End_Outage', 'Begin_Corrupted' or 'End_Corrupted') will then be passed on to the script as command line parameters (\%1 and \%2 on Windows systems or \$1 and \$2 on UNIX/Linuxsystems).
+As mentioned previously, BNC can trigger a shell script or a batch file to be executed when one of the events described are reported. This script can be used to email an advisory note to network operator or stream providers. To enable this feature, specify the full path to the script or batch file in the 'Script' field. The affected mountpoint and type of event reported ('Begin_Outage', 'End_Outage', 'Begin_Corrupted' or 'End_Corrupted') will then be passed on to the script as command line parameters (\%1 and \%2 on Windows systems or \$1 and \$2 on Unix/Linux systems).
 </p>
 <p>
@@ -422 +422 @@
 #!/bin/bash
 sleep $((60*RANDOM/32767))
-cat | mail -s "BNC: $2 Stream $1" email@address &lt;&lt;!
+cat | mail -s "NABU: $1" email@address &lt;&lt;!
 Advisory Note to BNC User,
-Please note a $2 advisory from BNC for stream $1 dated `date`.
+Please note the following advisory received from BNC.
+Stream: $*
 Regards, BNC
 !