source: ntrip/trunk/BNC/bncapp.cpp@ 1024

Last change on this file since 1024 was 1024, checked in by zdenek, 16 years ago

Zdenek Lukes: added logic for decoding of message 20/21 from RTCM 2.3 streams
File size: 19.7 KB
Line 
1// Part of BNC, a utility for retrieving decoding and
2// converting GNSS data streams from NTRIP broadcasters.
3//
4// Copyright (C) 2007
5// German Federal Agency for Cartography and Geodesy (BKG)
6// http://www.bkg.bund.de
7// Czech Technical University Prague, Department of Geodesy
8// http://www.fsv.cvut.cz
9//
10// Email: euref-ip@bkg.bund.de
11//
12// This program is free software; you can redistribute it and/or
13// modify it under the terms of the GNU General Public License
14// as published by the Free Software Foundation, version 2.
15//
16// This program is distributed in the hope that it will be useful,
17// but WITHOUT ANY WARRANTY; without even the implied warranty of
18// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19// GNU General Public License for more details.
20//
21// You should have received a copy of the GNU General Public License
22// along with this program; if not, write to the Free Software
23// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
24
25/* -------------------------------------------------------------------------
26 * BKG NTRIP Client
27 * -------------------------------------------------------------------------
28 *
29 * Class: bncApp
30 *
31 * Purpose: This class implements the main application
32 *
33 * Author: L. Mervart
34 *
35 * Created: 29-Aug-2006
36 *
37 * Changes:
38 *
39 * -----------------------------------------------------------------------*/
40
41#include <QSettings>
42#include <QMessageBox>
43#include <cmath>
44#include <unistd.h>
45
46#include "bncapp.h"
47#include "bncutils.h"
48#include "bncrinex.h"
49
50using namespace std;
51
52struct converttimeinfo {
53 int second; /* seconds of GPS time [0..59] */
54 int minute; /* minutes of GPS time [0..59] */
55 int hour; /* hour of GPS time [0..24] */
56 int day; /* day of GPS time [1..28..30(31)*/
57 int month; /* month of GPS time [1..12]*/
58 int year; /* year of GPS time [1980..] */
59};
60
61extern "C" {
62 void converttime(struct converttimeinfo *c, int week, int tow);
63 void updatetime(int *week, int *tow, int tk, int fixnumleap);
64}
65
66// Constructor
67////////////////////////////////////////////////////////////////////////////
68bncApp::bncApp(int argc, char* argv[], bool GUIenabled) :
69 QApplication(argc, argv, GUIenabled) {
70
71 _bncVersion = "BNC 1.6";
72
73 _logFileFlag = 0;
74 _logFile = 0;
75 _logStream = 0;
76 _caster = 0;
77
78 // Lists of Ephemeris
79 // ------------------
80 for (int ii = PRN_GPS_START; ii <= PRN_GPS_END; ii++) {
81 _gpsEph[ii-PRN_GPS_START] = 0;
82 }
83 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) {
84 _glonassEph[ii-PRN_GLONASS_START] = 0;
85 }
86
87 // Eph file(s)
88 // -----------
89 _rinexVers = 0;
90 _ephFileGPS = 0;
91 _ephStreamGPS = 0;
92 _ephFileGlonass = 0;
93 _ephStreamGlonass = 0;
94
95 _port = 0;
96 _server = 0;
97 _sockets = 0;
98
99 _portCorr = 0;
100 _serverCorr = 0;
101 _socketsCorr = 0;
102
103 _pgmName = _bncVersion.leftJustified(20, ' ', true);
104#ifdef WIN32
105 _userName = QString("${USERNAME}");
106#else
107 _userName = QString("${USER}");
108#endif
109 expandEnvVar(_userName);
110 _userName = _userName.leftJustified(20, ' ', true);
111
112 QSettings settings;
113 _lastDumpCoSec = 0;
114 _waitCoTime = settings.value("corrTime").toInt();
115 if (_waitCoTime < 1) {
116 _waitCoTime = 1;
117 }
118
119 _corrs = new QMultiMap<long, QString>;
120}
121
122// Destructor
123////////////////////////////////////////////////////////////////////////////
124bncApp::~bncApp() {
125 delete _logStream;
126 delete _logFile;
127 delete _ephStreamGPS;
128 delete _ephFileGPS;
129 delete _server;
130 delete _sockets;
131 delete _serverCorr;
132 delete _socketsCorr;
133 if (_rinexVers == 2) {
134 delete _ephStreamGlonass;
135 delete _ephFileGlonass;
136 }
137 for (int ii = PRN_GPS_START; ii <= PRN_GPS_END; ii++) {
138 delete _gpsEph[ii-PRN_GPS_START];
139 }
140 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) {
141 delete _glonassEph[ii-PRN_GLONASS_START];
142 }
143
144 delete _corrs;
145}
146
147// Write a Program Message
148////////////////////////////////////////////////////////////////////////////
149void bncApp::slotMessage(const QByteArray msg) {
150
151 QMutexLocker locker(&_mutex);
152
153 messagePrivate(msg);
154}
155
156// Write a Program Message (private, no lock)
157////////////////////////////////////////////////////////////////////////////
158void bncApp::messagePrivate(const QByteArray& msg) {
159
160 // First time resolve the log file name
161 // ------------------------------------
162 if (_logFileFlag == 0) {
163 _logFileFlag = 1;
164 QSettings settings;
165 QString logFileName = settings.value("logFile").toString();
166 if ( !logFileName.isEmpty() ) {
167 expandEnvVar(logFileName);
168 _logFile = new QFile(logFileName);
169 if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
170 _logFile->open(QIODevice::WriteOnly | QIODevice::Append);
171 }
172 else {
173 _logFile->open(QIODevice::WriteOnly);
174 }
175 _logStream = new QTextStream();
176 _logStream->setDevice(_logFile);
177 }
178 }
179
180 if (_logStream) {
181 *_logStream << QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
182 *_logStream << msg.data() << endl;
183 _logStream->flush();
184 }
185}
186
187// New GPS Ephemeris
188////////////////////////////////////////////////////////////////////////////
189void bncApp::slotNewGPSEph(gpsephemeris* gpseph) {
190
191 gpsephemeris copy_gpseph = *gpseph;
192 emit newEphGPS(copy_gpseph);
193
194 QMutexLocker locker(&_mutex);
195
196 printEphHeader();
197
198 gpsephemeris** ee = &_gpsEph[gpseph->satellite-1];
199 if ( *ee == 0 ||
200 gpseph->GPSweek > (*ee)->GPSweek ||
201 (gpseph->GPSweek == (*ee)->GPSweek && gpseph->TOC > (*ee)->TOC) ) {
202 delete *ee;
203 *ee = gpseph;
204 printGPSEph(gpseph, true);
205 }
206 else {
207 printGPSEph(gpseph, false);
208 delete gpseph;
209 }
210
211}
212
213// New Glonass Ephemeris
214////////////////////////////////////////////////////////////////////////////
215void bncApp::slotNewGlonassEph(glonassephemeris* glonasseph) {
216
217 QMutexLocker locker(&_mutex);
218
219 printEphHeader();
220
221 glonassephemeris** ee = &_glonassEph[glonasseph->almanac_number-1];
222
223 int wwOld, towOld, wwNew, towNew;
224 if (*ee != 0) {
225 wwOld = (*ee)->GPSWeek;
226 towOld = (*ee)->GPSTOW;
227 updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);
228
229 wwNew = glonasseph->GPSWeek;
230 towNew = glonasseph->GPSTOW;
231 updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0);
232 }
233
234 if ( *ee == 0 ||
235 wwNew > wwOld ||
236 (wwNew == wwOld && towNew > towOld) ) {
237 delete *ee;
238 *ee = glonasseph;
239 printGlonassEph(glonasseph, true);
240 }
241 else {
242 printGlonassEph(glonasseph, false);
243 delete glonasseph;
244 }
245}
246
247// Print Header of the output File(s)
248////////////////////////////////////////////////////////////////////////////
249void bncApp::printEphHeader() {
250
251 QSettings settings;
252
253 // Initialization
254 // --------------
255 if (_rinexVers == 0) {
256
257 if ( Qt::CheckState(settings.value("ephV3").toInt()) == Qt::Checked) {
258 _rinexVers = 3;
259 }
260 else {
261 _rinexVers = 2;
262 }
263
264 _ephPath = settings.value("ephPath").toString();
265
266 if ( !_ephPath.isEmpty() ) {
267 if ( _ephPath[_ephPath.length()-1] != QDir::separator() ) {
268 _ephPath += QDir::separator();
269 }
270 expandEnvVar(_ephPath);
271 }
272 }
273
274 // (Re-)Open output File(s)
275 // ------------------------
276 if (!_ephPath.isEmpty()) {
277
278 QDateTime datTim = QDateTime::currentDateTime().toUTC();
279
280 QString ephFileNameGPS = _ephPath + "BRDC" +
281 QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0'));
282
283 QString hlpStr = bncRinex::nextEpochStr(datTim,
284 settings.value("ephIntr").toString());
285
286 if (_rinexVers == 3) {
287 ephFileNameGPS += hlpStr + datTim.toString(".yyP");
288 }
289 else {
290 ephFileNameGPS += hlpStr + datTim.toString(".yyN");
291 }
292
293 if (_ephFileNameGPS == ephFileNameGPS) {
294 return;
295 }
296 else {
297 _ephFileNameGPS = ephFileNameGPS;
298 }
299
300 for (int ii = PRN_GPS_START; ii <= PRN_GPS_END; ii++) {
301 delete _gpsEph[ii-PRN_GPS_START];
302 _gpsEph[ii-PRN_GPS_START] = 0;
303 }
304 for (int ii = PRN_GLONASS_START; ii <= PRN_GLONASS_END; ii++) {
305 delete _glonassEph[ii-PRN_GLONASS_START];
306 _glonassEph[ii-PRN_GLONASS_START] = 0;
307 }
308
309 delete _ephStreamGPS;
310 delete _ephFileGPS;
311
312 QFlags<QIODevice::OpenModeFlag> appendFlagGPS;
313 QFlags<QIODevice::OpenModeFlag> appendFlagGlonass;
314
315 if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked &&
316 QFile::exists(ephFileNameGPS) ) {
317 appendFlagGPS = QIODevice::Append;
318 }
319
320 _ephFileGPS = new QFile(ephFileNameGPS);
321 _ephFileGPS->open(QIODevice::WriteOnly | appendFlagGPS);
322 _ephStreamGPS = new QTextStream();
323 _ephStreamGPS->setDevice(_ephFileGPS);
324
325 if (_rinexVers == 3) {
326 _ephFileGlonass = _ephFileGPS;
327 _ephStreamGlonass = _ephStreamGPS;
328 }
329 else if (_rinexVers == 2) {
330 QString ephFileNameGlonass = _ephPath + "BRDC" +
331 QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
332 hlpStr + datTim.toString(".yyG");
333
334 delete _ephStreamGlonass;
335 delete _ephFileGlonass;
336
337 if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked &&
338 QFile::exists(ephFileNameGlonass) ) {
339 appendFlagGlonass = QIODevice::Append;
340 }
341
342 _ephFileGlonass = new QFile(ephFileNameGlonass);
343 _ephFileGlonass->open(QIODevice::WriteOnly | appendFlagGlonass);
344 _ephStreamGlonass = new QTextStream();
345 _ephStreamGlonass->setDevice(_ephFileGlonass);
346 }
347
348 // Header - RINEX Version 3
349 // ------------------------
350 if (_rinexVers == 3) {
351 if ( ! (appendFlagGPS & QIODevice::Append)) {
352 QString line;
353 line.sprintf(
354 "%9.2f%11sN: GNSS NAV DATA M: Mixed%12sRINEX VERSION / TYPE\n",
355 3.0, "", "");
356 *_ephStreamGPS << line;
357
358 QString hlp = QDateTime::currentDateTime().toUTC().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
359 *_ephStreamGPS << _pgmName.toAscii().data()
360 << _userName.toAscii().data()
361 << hlp.toAscii().data()
362 << "PGM / RUN BY / DATE" << endl;
363
364 line.sprintf("%60sEND OF HEADER\n", "");
365 *_ephStreamGPS << line;
366
367 _ephStreamGPS->flush();
368 }
369 }
370
371 // Headers - RINEX Version 2
372 // -------------------------
373 else if (_rinexVers == 2) {
374 if (! (appendFlagGPS & QIODevice::Append)) {
375 QString line;
376 line.sprintf(
377 "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.11, "", "");
378 *_ephStreamGPS << line;
379
380 QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
381 *_ephStreamGPS << _pgmName.toAscii().data()
382 << _userName.toAscii().data()
383 << hlp.toAscii().data()
384 << "PGM / RUN BY / DATE" << endl;
385
386 line.sprintf("%60sEND OF HEADER\n", "");
387 *_ephStreamGPS << line;
388
389 _ephStreamGPS->flush();
390 }
391 if (! (appendFlagGlonass & QIODevice::Append)) {
392 QString line;
393 line.sprintf(
394 "%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",2.11,"","");
395 *_ephStreamGlonass << line;
396
397 QString hlp = QDateTime::currentDateTime().toUTC().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
398 *_ephStreamGlonass << _pgmName.toAscii().data()
399 << _userName.toAscii().data()
400 << hlp.toAscii().data()
401 << "PGM / RUN BY / DATE" << endl;
402
403 line.sprintf("%60sEND OF HEADER\n", "");
404 *_ephStreamGlonass << line;
405
406 _ephStreamGlonass->flush();
407 }
408 }
409 }
410}
411
412// Print One GPS Ephemeris
413////////////////////////////////////////////////////////////////////////////
414void bncApp::printGPSEph(gpsephemeris* ep, bool printFile) {
415
416 QString lineV2;
417 QString lineV3;
418
419 struct converttimeinfo cti;
420 converttime(&cti, ep->GPSweek, ep->TOC);
421
422 lineV3.sprintf("G%02d %04d %02d %02d %02d %02d %02d %18.11e %18.11e %18.11e\n",
423 ep->satellite, cti.year, cti.month, cti.day, cti.hour,
424 cti.minute, cti.second, ep->clock_bias, ep->clock_drift,
425 ep->clock_driftrate);
426
427 lineV2.sprintf("%02d %02d %02d %02d %02d %02d%5.1f %18.11e %18.11e %18.11e\n",
428 ep->satellite, cti.year%100, cti.month, cti.day, cti.hour,
429 cti.minute, (double) cti.second, ep->clock_bias,
430 ep->clock_drift, ep->clock_driftrate);
431
432 QString line;
433 QByteArray allLines;
434
435 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", (double)ep->IODE,
436 ep->Crs, ep->Delta_n, ep->M0);
437 allLines += line;
438
439 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->Cuc,
440 ep->e, ep->Cus, ep->sqrt_A);
441 allLines += line;
442
443 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n",
444 (double) ep->TOE, ep->Cic, ep->OMEGA0, ep->Cis);
445 allLines += line;
446
447 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->i0,
448 ep->Crc, ep->omega, ep->OMEGADOT);
449 allLines += line;
450
451 double dd = 0;
452 unsigned long ii = ep->flags;
453 if(ii & GPSEPHF_L2CACODE)
454 dd += 2.0;
455 if(ii & GPSEPHF_L2PCODE)
456 dd += 1.0;
457 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->IDOT, dd,
458 (double) ep->GPSweek, ii & GPSEPHF_L2PCODEDATA ? 1.0 : 0.0);
459 allLines += line;
460
461 if(ep->URAindex <= 6) /* URA index */
462 dd = ceil(10.0*pow(2.0, 1.0+((double)ep->URAindex)/2.0))/10.0;
463 else
464 dd = ceil(10.0*pow(2.0, ((double)ep->URAindex)/2.0))/10.0;
465 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", dd,
466 ((double) ep->SVhealth), ep->TGD, ((double) ep->IODC));
467 allLines += line;
468
469 line.sprintf(" %18.11e %18.11e\n", ((double)ep->TOW), 0.0);
470 allLines += line;
471
472 printOutput(printFile, _ephStreamGPS, lineV2, lineV3, allLines);
473}
474
475// Print One Glonass Ephemeris
476////////////////////////////////////////////////////////////////////////////
477void bncApp::printGlonassEph(glonassephemeris* ep, bool printFile) {
478
479 int ww = ep->GPSWeek;
480 int tow = ep->GPSTOW;
481 struct converttimeinfo cti;
482
483 updatetime(&ww, &tow, ep->tb*1000, 0);
484 converttime(&cti, ww, tow);
485
486 int tk = ep->tk-3*60*60;
487 if (tk < 0) {
488 tk += 86400;
489 }
490
491 QString lineV2;
492 QString lineV3;
493
494 lineV3.sprintf("R%02d %04d %02d %02d %02d %02d %02d %18.11e %18.11e %18.11e\n",
495 ep->almanac_number, cti.year, cti.month, cti.day, cti.hour,
496 cti.minute, cti.second, -ep->tau, ep->gamma, (double) tk);
497
498 lineV2.sprintf("%02d %02d %02d %02d %02d %02d%5.1f %18.11e %18.11e %18.11e\n",
499 ep->almanac_number, cti.year%100, cti.month, cti.day,
500 cti.hour, cti.minute, (double) cti.second, -ep->tau,
501 ep->gamma, (double) tk);
502
503 QString line;
504 QByteArray allLines;
505
506 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->x_pos,
507 ep->x_velocity, ep->x_acceleration,
508 (ep->flags & GLOEPHF_UNHEALTHY) ? 1.0 : 0.0);
509 allLines += line;
510
511 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->y_pos,
512 ep->y_velocity, ep->y_acceleration,
513 (double) ep->frequency_number);
514 allLines += line;
515
516 line.sprintf(" %18.11e %18.11e %18.11e %18.11e\n", ep->z_pos,
517 ep->z_velocity, ep->z_acceleration, (double) ep->E);
518 allLines += line;
519
520 printOutput(printFile, _ephStreamGlonass, lineV2, lineV3, allLines);
521}
522
523// Output
524////////////////////////////////////////////////////////////////////////////
525void bncApp::printOutput(bool printFile, QTextStream* stream,
526 const QString& lineV2,
527 const QString& lineV3,
528 const QByteArray& allLines) {
529 // Output into file
530 // ----------------
531 if (printFile && stream) {
532 if (_rinexVers == 2) {
533 *stream << lineV2.toAscii();
534 }
535 else {
536 *stream << lineV3.toAscii();
537 }
538 *stream << allLines;
539 stream->flush();
540 }
541
542 // Output into the socket
543 // ----------------------
544 if (_sockets) {
545 QMutableListIterator<QTcpSocket*> is(*_sockets);
546 while (is.hasNext()) {
547 QTcpSocket* sock = is.next();
548 if (sock->state() == QAbstractSocket::ConnectedState) {
549 if (sock->write(lineV3.toAscii()) == -1 ||
550 sock->write(allLines) == -1) {
551 delete sock;
552 is.remove();
553 }
554 }
555 else if (sock->state() != QAbstractSocket::ConnectingState) {
556 delete sock;
557 is.remove();
558 }
559 }
560 }
561}
562
563// Set Port Number
564////////////////////////////////////////////////////////////////////////////
565void bncApp::setPort(int port) {
566 _port = port;
567 if (_port != 0) {
568 delete _server;
569 _server = new QTcpServer;
570 _server->listen(QHostAddress::Any, _port);
571 connect(_server, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
572 delete _sockets;
573 _sockets = new QList<QTcpSocket*>;
574 }
575}
576
577// Set Port Number
578////////////////////////////////////////////////////////////////////////////
579void bncApp::setPortCorr(int port) {
580 _portCorr = port;
581 if (_portCorr != 0) {
582 delete _serverCorr;
583 _serverCorr = new QTcpServer;
584 _serverCorr->listen(QHostAddress::Any, _portCorr);
585 connect(_serverCorr, SIGNAL(newConnection()), this, SLOT(slotNewConnectionCorr()));
586 delete _socketsCorr;
587 _socketsCorr = new QList<QTcpSocket*>;
588 }
589}
590
591// New Connection
592////////////////////////////////////////////////////////////////////////////
593void bncApp::slotNewConnection() {
594 _sockets->push_back( _server->nextPendingConnection() );
595}
596
597// New Connection
598////////////////////////////////////////////////////////////////////////////
599void bncApp::slotNewConnectionCorr() {
600 _socketsCorr->push_back( _serverCorr->nextPendingConnection() );
601}
602
603//
604////////////////////////////////////////////////////////////////////////////
605void bncApp::slotQuit() {
606 delete _caster;
607 quit();
608}
609
610//
611////////////////////////////////////////////////////////////////////////////
612void bncApp::slotNewCorrLine(QString line, QString staID, long coTime) {
613
614 QMutexLocker locker(&_mutex);
615
616 if (!_socketsCorr) {
617 return;
618 }
619
620 QSettings settings;
621 _waitCoTime = settings.value("corrTime").toInt();
622 if (_waitCoTime < 1) {
623 _waitCoTime = 1;
624 }
625
626 // First time, set the _lastDumpSec immediately
627 // --------------------------------------------
628 if (_lastDumpCoSec == 0) {
629 _lastDumpCoSec = coTime - 1;
630 }
631
632 // An old correction - throw it away
633 // ---------------------------------
634 if (coTime <= _lastDumpCoSec) {
635 QString line = "old correction: " + staID +
636 QString().sprintf(" age %ld",
637 _lastDumpCoSec - coTime + _waitCoTime);
638 messagePrivate(line.toAscii());
639 emit( newMessage(line.toAscii()) );
640 return;
641 }
642
643 _corrs->insert(coTime, QString(line + " " + staID));
644
645 // Dump Corrections
646 // ----------------
647 if (coTime - _waitCoTime > _lastDumpCoSec) {
648 dumpCorrs(_lastDumpCoSec + 1, coTime - _waitCoTime);
649 _lastDumpCoSec = coTime - _waitCoTime;
650 }
651}
652
653// Dump Complete Correction Epochs
654////////////////////////////////////////////////////////////////////////////
655void bncApp::dumpCorrs(long minTime, long maxTime) {
656
657 for (long sec = minTime; sec <= maxTime; sec++) {
658 QList<QString> allCorrs = _corrs->values(sec);
659 QListIterator<QString> it(allCorrs);
660 while (it.hasNext()) {
661 QString corrLine = it.next() + "\n";
662
663 QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
664 while (is.hasNext()) {
665 QTcpSocket* sock = is.next();
666 if (sock->state() == QAbstractSocket::ConnectedState) {
667 if (sock->write(corrLine.toAscii()) == -1) {
668 delete sock;
669 is.remove();
670 }
671 }
672 else if (sock->state() != QAbstractSocket::ConnectingState) {
673 delete sock;
674 is.remove();
675 }
676 }
677 }
678 _corrs->remove(sec);
679 }
680}
Note: See TracBrowser for help on using the repository browser.