mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

NAVTEX/SYNOP/KML 

* suppress info messages during prog start
    - prodigiuous use of LOG_INFO increases difficulty of
      debugging other aspects of fldigi
    - enable the INFO messages for debugging or to observe
      program flow by setting command line flag
      -more-info ; case is significant
pull/4/head
David Freese 2015-10-28 09:37:43 -05:00
rodzic 51535ff236
commit d6a34a40f1
5 zmienionych plików z 285 dodań i 187 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/include/fl_digi.h
Wyświetl plik

@ -57,6 +57,8 @@ extern Fl_Double_Window *dlgRecordLoader;
extern bool first_use;
extern bool bMOREINFO;
extern FTextRX *ReceiveText;
extern FTextTX *TransmitText;
extern pskBrowser *mainViewer;

12
src/main.cxx
Wyświetl plik

@ -179,6 +179,7 @@ FILE *client;
bool mailserver = false, mailclient = false, arqmode = false;
static bool show_cpucheck = false;
static bool iconified = false;
bool bMOREINFO = false;
string option_help, version_text, build_text;
@ -308,7 +309,7 @@ static void auto_start()
// reset those default values that have been overriden by a command line parameter
void check_overrides()
{
if (xmlrpc_address_override_flag)
if (xmlrpc_address_override_flag)
progdefaults.xmlrpc_address = override_xmlrpc_address;
if (xmlrpc_port_override_flag)
progdefaults.xmlrpc_port = override_xmlrpc_port;
@ -1020,6 +1021,7 @@ int parse_args(int argc, char **argv, int& idx)
#if USE_PORTAUDIO
OPT_FRAMES_PER_BUFFER,
#endif
OPT_MORE_INFO,
OPT_NOISE, OPT_DEBUG_LEVEL, OPT_DEBUG_PSKMAIL, OPT_DEBUG_AUDIO,
OPT_EXIT_AFTER,
OPT_DEPRECATED, OPT_HELP, OPT_VERSION, OPT_BUILD_INFO };
@ -1078,6 +1080,7 @@ int parse_args(int argc, char **argv, int& idx)
#if USE_PORTAUDIO
{ "frames-per-buffer",1, 0, OPT_FRAMES_PER_BUFFER },
#endif
{ "more-info", 1, 0, OPT_MORE_INFO },
{ "exit-after", 1, 0, OPT_EXIT_AFTER },
{ "noise", 0, 0, OPT_NOISE },
@ -1295,6 +1298,10 @@ int parse_args(int argc, char **argv, int& idx)
break;
#endif // USE_PORTAUDIO
case OPT_MORE_INFO:
bMOREINFO = true;
break;
case OPT_EXIT_AFTER:
Fl::add_timeout(strtod(optarg, 0), exit_cb);
break;
@ -1737,7 +1744,8 @@ void kml_init(bool load_files)
custData );
}
catch( const std::exception & exc ) {
LOG_WARN("Cannot publish user position:%s", exc.what() );
;// LOG_WARN("Cannot publish user position:%s", exc.what() );
}
}

204
src/misc/kmlserver.cxx
Wyświetl plik

@ -45,6 +45,7 @@
#include "threads.h"
#include "strutil.h"
#include "configuration.h"
#include "fl_digi.h"
#include "irrXML.h"
@ -100,7 +101,7 @@ static time_t KmlFromTimestamp( const char * ts ) {
/// So all fields are initialised with correct default values.
time_t timNow = time(NULL);
tm objTm = *gmtime( &timNow );
tm objTm = *gmtime( &timNow );
int r = sscanf( ts, "%4d-%02d-%02dT%02d:%02dZ",
&objTm.tm_year,
@ -203,7 +204,7 @@ static void KmlHeader( std::ostream & ostrm, const std::string & title ) {
}
/// Appended at the end of each KML document.
static const char KmlFooter[] =
static const char KmlFooter[] =
"</Document>\n"
"</kml>\n" ;
@ -260,7 +261,7 @@ class KmlSrvImpl : public KmlServer {
ostrm << "<" FLDIGI_TAG_ITM " " FLDIGI_TAG_KEY "=\"" << it->first
<< "\" " FLDIGI_TAG_VAL "=\"";
StripHtmlTags(ostrm,it->second);
ostrm << "\" />";
ostrm << "\" />";
}
ostrm << "</" FLDIGI_TAG_EVT ">\n" ;
}
@ -320,7 +321,8 @@ class KmlSrvImpl : public KmlServer {
if( ( 0 == strncmp( str, namStyles.c_str(), sz ) ) && ( str[sz] == '#' ) ) {
m_styleNam = str + sz + 1;
} else {
LOG_INFO("Inconsistent URL style:%s",str );
if (bMOREINFO)
LOG_INFO("Inconsistent URL style:%s",str );
m_styleNam = str ;
}
}
@ -410,7 +412,8 @@ class KmlSrvImpl : public KmlServer {
// There should be at least one event.
if( beEvt == enEvt ) {
LOG_WARN("Inconsistency: No event kmlId=%s",m_kmlId.c_str() );
if (bMOREINFO)
LOG_WARN("Inconsistency: No event kmlId=%s",m_kmlId.c_str() );
return ;
}
@ -611,7 +614,8 @@ class KmlSrvImpl : public KmlServer {
/// this key, and this iterator is forward_iterator only.
iterator it = find( refVL.first ), en = end() ;
if( it == en ) {
// LOG_INFO("Cannot find '%s'", refVL.first.c_str() );
if (bMOREINFO)
LOG_INFO("Cannot find '%s'", refVL.first.c_str() );
it = insert( end(), refVL );
return;
}
@ -639,7 +643,8 @@ class KmlSrvImpl : public KmlServer {
return ;
}
// LOG_INFO("Inserted '%s' merge_dist=%lf", refVL.first.c_str(), dist );
if (bMOREINFO)
LOG_INFO("Inserted '%s' merge_dist=%lf", refVL.first.c_str(), dist );
/// The object is inserted at the end of all elements with the same key.
iterator ret = insert( next, refVL );
@ -677,7 +682,8 @@ class KmlSrvImpl : public KmlServer {
/// Called by the subthread. It can merge data of placemarks with the same name
/// and different positions due to a move. This has to be very fast because under lock protection.
void FlushQueue(double merge_dist) {
// LOG_INFO("FlushQueue nbelts %d sz=%d", m_queue_to_insert.size(), size() );
if (bMOREINFO)
LOG_INFO("FlushQueue nbelts %d sz=%d", m_queue_to_insert.size(), size() );
if( m_queue_to_insert.empty() ) return ;
@ -685,7 +691,8 @@ class KmlSrvImpl : public KmlServer {
{
DirectInsert( *itPL, merge_dist );
}
// LOG_INFO("Flushed into sz=%d", size() );
if (bMOREINFO)
LOG_INFO("Flushed into sz=%d", size() );
// TODO: If lock contention problems, we might swap this list with another one owned by this
// objet. This would later be merged into the container before saving data to disk.
@ -715,8 +722,10 @@ class KmlSrvImpl : public KmlServer {
/// Cleanup all data older than this.
time_t limit_time = now - retention_delay * seconds_per_hour ;
LOG_INFO("sz=%d retention=%d hours now=%s limit=%s",
(int)size(), retention_delay, KmlTimestamp(now).c_str(), KmlTimestamp(limit_time).c_str() );
if (bMOREINFO)
LOG_INFO("sz=%d retention=%d hours now=%s limit=%s",
(int)size(), retention_delay,
KmlTimestamp(now).c_str(), KmlTimestamp(limit_time).c_str() );
size_t nbFullErased = 0 ;
size_t nbPartErased = 0 ;
@ -737,8 +746,9 @@ class KmlSrvImpl : public KmlServer {
// Maybe the container only lost data because of data expiration, so it must be saved.
bool must_save_now = m_must_save || ( nbFullErased > 0 ) || ( nbPartErased > 0 ) ;
LOG_INFO("Sz=%d FullyErased=%d PartialErased=%d m_must_save=%d must_save_now=%d",
(int)size(), (int)nbFullErased, (int)nbPartErased, m_must_save, must_save_now );
if (bMOREINFO)
LOG_INFO("Sz=%d FullyErased=%d PartialErased=%d m_must_save=%d must_save_now=%d",
(int)size(), (int)nbFullErased, (int)nbPartErased, m_must_save, must_save_now );
m_must_save = must_save_now ;
}
@ -758,7 +768,8 @@ class KmlSrvImpl : public KmlServer {
/// For safety purpose, we do not empty the file. It might be an error.
if( empty() ) {
LOG_INFO("Should empty KML file %s. Grace period.", kmlFilNam.c_str() );
if (bMOREINFO)
LOG_INFO("Should empty KML file %s. Grace period.", kmlFilNam.c_str() );
return false ;
}
@ -822,7 +833,9 @@ class KmlSrvImpl : public KmlServer {
ar << KmlFooter ;
LOG_INFO("Saved %s: %d placemarks to %s", category.c_str(), nbPlacemarks, kmlFilNam.c_str() );
if (bMOREINFO)
LOG_INFO("Saved %s: %d placemarks to %s",
category.c_str(), nbPlacemarks, kmlFilNam.c_str() );
return true ;
} // KmlSrvImpl::PlacesMapT::RewriteKmlFileOneCategory
@ -855,7 +868,7 @@ class KmlSrvImpl : public KmlServer {
/// This points to the specific KML file of the category.
void CategoryNetworkLink( std::ostream & strm, const std::string & category ) const
{
strm <<
strm <<
"<NetworkLink>\n"
" <name>" << category << "</name>\n"
" <Link>\n"
@ -880,17 +893,20 @@ class KmlSrvImpl : public KmlServer {
/// If the file is there, leave as it is because it is maybe customize.
if( filDst ) {
LOG_INFO("Style file %s not altered", namDst.c_str() );
if (bMOREINFO)
LOG_INFO("Style file %s not altered", namDst.c_str() );
goto close_and_quit ;
}
filDst = fopen( namDst.c_str(), "w" );
if( filDst == NULL ) {
LOG_INFO("Cannot open destination style file %s", namDst.c_str() );
if (bMOREINFO)
LOG_INFO("Cannot open destination style file %s", namDst.c_str() );
goto close_and_quit ;
}
filSrc = fopen( namSrc.c_str(), "r" );
if( filSrc == NULL ) {
LOG_INFO("Cannot open source style file %s", namSrc.c_str() );
if (bMOREINFO)
LOG_INFO("Cannot open source style file %s", namSrc.c_str() );
goto close_and_quit ;
}
@ -905,7 +921,8 @@ class KmlSrvImpl : public KmlServer {
goto close_and_quit ;
}
}
LOG_INFO("Style file %s copied to %s", namSrc.c_str(), namDst.c_str() );
if (bMOREINFO)
LOG_INFO("Style file %s copied to %s", namSrc.c_str(), namDst.c_str() );
close_and_quit:
if( filDst ) fclose(filDst);
if( filSrc ) fclose(filSrc);
@ -916,7 +933,8 @@ class KmlSrvImpl : public KmlServer {
// This is the file, that the user must click on.
std::string baseFil = m_kml_dir + "fldigi.kml" ;
LOG_INFO("Creating baseFil=%s", baseFil.c_str() );
if (bMOREINFO)
LOG_INFO("Creating baseFil=%s", baseFil.c_str() );
/// We do not need to make this file atomic because it is read once only.
AtomicRenamer ar( baseFil );
@ -947,7 +965,7 @@ class KmlSrvImpl : public KmlServer {
"<coordinates>\n";
double dist = 0.0 ;
int nbStops = 0 ;
// "135.2, 35.4, 0.
// "135.2, 35.4, 0.
for(;;) {
beg->second.WriteCooSub( ostrm );
ostrm << "\n";
@ -980,7 +998,8 @@ class KmlSrvImpl : public KmlServer {
: m_filnam( filnam )
, m_filtmp( filnam + ".tmp" )
{
// LOG_INFO("AtomicRenamer opening tmp %s", filnam.c_str() );
if (bMOREINFO)
LOG_INFO("AtomicRenamer opening tmp %s", filnam.c_str() );
open( m_filtmp.c_str() );
if( bad() ) {
LOG_WARN("Cannot open %s", m_filtmp.c_str() );
@ -1069,7 +1088,8 @@ class KmlSrvImpl : public KmlServer {
void ReloadSingleKmlFile( const std::string & category ) {
std::string kmlFilNam = CategFile( category );
LOG_INFO("kmlFilNam=%s m_merge_dist=%lf", kmlFilNam.c_str(), m_merge_dist );
if (bMOREINFO)
LOG_INFO("kmlFilNam=%s m_merge_dist=%lf", kmlFilNam.c_str(), m_merge_dist );
PlacesMapT *ptrMap = m_placemarks.FindCategory( category );
@ -1124,19 +1144,19 @@ class KmlSrvImpl : public KmlServer {
const char * msgTxt = xml->getNodeData();
LOG_DEBUG( "getNodeData=%s currState=%s", msgTxt, KmlRdToStr(currState) );
switch(currState) {
case KMLRD_FOLDER_NAME :
case KMLRD_FOLDER_NAME :
currFolderName = msgTxt ? msgTxt : "NullFolder";
break;
case KMLRD_FOLDER_PLACEMARK_POINT_COORDINATES :
case KMLRD_FOLDER_PLACEMARK_POINT_COORDINATES :
currPM.SetCoordinates(msgTxt);
break;
case KMLRD_FOLDER_PLACEMARK_NAME :
case KMLRD_FOLDER_PLACEMARK_NAME :
currPlcmrkName = msgTxt ? msgTxt : "NullPlacemarkName";
break;
case KMLRD_FOLDER_PLACEMARK_SNIPPET :
case KMLRD_FOLDER_PLACEMARK_SNIPPET :
currPlacemarkDescr = msgTxt ? msgTxt : "NullSnippet";
break;
case KMLRD_FOLDER_PLACEMARK_STYLEURL :
case KMLRD_FOLDER_PLACEMARK_STYLEURL :
currPM.SetStyle(msgTxt);
break;
default:
@ -1148,7 +1168,8 @@ class KmlSrvImpl : public KmlServer {
if( ! avoidNode.empty() ) break ;
const char *nodeName = xml->getNodeName();
// LOG_INFO( "getNodeName=%s currState=%s", nodeName, KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO( "getNodeName=%s currState=%s", nodeName, KmlRdToStr(currState) );
// TODO: Have a hashmap for each case.
switch(currState) {
case KMLRD_NONE :
@ -1160,12 +1181,13 @@ class KmlSrvImpl : public KmlServer {
strcmp( "Document", nodeName ) &&
strcmp( "name", nodeName ) )
{
if (bMOREINFO)
LOG_INFO("Unexpected %s in document %s. currState=%s",
nodeName, category.c_str(), KmlRdToStr(currState) );
nodeName, category.c_str(), KmlRdToStr(currState) );
}
}
break;
case KMLRD_FOLDER :
case KMLRD_FOLDER :
if (!strcmp("name", nodeName)) {
currState = KMLRD_FOLDER_NAME ;
}
@ -1178,11 +1200,12 @@ class KmlSrvImpl : public KmlServer {
else {
avoidNode = nodeName ;
currState = KMLRD_FOLDER_UNDEFINED ;
LOG_INFO("Unexpected %s in folder %s. currState=%s",
nodeName, currFolderName.c_str(), KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO("Unexpected %s in folder %s. currState=%s",
nodeName, currFolderName.c_str(), KmlRdToStr(currState) );
}
break;
case KMLRD_FOLDER_PLACEMARK :
case KMLRD_FOLDER_PLACEMARK :
// There are different sorts of Placemark such as Point or LineString.
if (!strcmp("Point", nodeName)) {
currState = KMLRD_FOLDER_PLACEMARK_POINT ;
@ -1214,18 +1237,20 @@ class KmlSrvImpl : public KmlServer {
// Other occurences of the same nodes will not be signaled.
if( pr.second ) {
LOG_INFO("Unexpected %s in placemark id=%s name=%s. currState=%s",
if (bMOREINFO)
LOG_INFO("Unexpected %s in placemark id=%s name=%s. currState=%s",
nodeName, currPM.KmlId().c_str(),
currPlcmrkName.c_str(), KmlRdToStr(currState) );
}
}
break;
case KMLRD_FOLDER_PLACEMARK_POINT :
case KMLRD_FOLDER_PLACEMARK_POINT :
if (!strcmp("coordinates", nodeName)) {
currState = KMLRD_FOLDER_PLACEMARK_POINT_COORDINATES ;
}
else {
LOG_INFO("Unexpected %s in coordinates. currState=%s",
if (bMOREINFO)
LOG_INFO("Unexpected %s in coordinates. currState=%s",
nodeName, KmlRdToStr(currState) );
}
break;
@ -1235,7 +1260,10 @@ class KmlSrvImpl : public KmlServer {
currTimestamp = KmlFromTimestamp( xml->getAttributeValue(FLDIGI_TIMESTAMP) );
currCustData.clear();
}
else LOG_INFO("Unexpected %s in extended data. currState=%s", nodeName, KmlRdToStr(currState) );
else
if (bMOREINFO)
LOG_INFO("Unexpected %s in extended data. currState=%s",
nodeName, KmlRdToStr(currState) );
break;
case KMLRD_FOLDER_PLACEMARK_EXTENDEDDATA_FLDIGIEVENT:
// http://irrlicht.sourceforge.net/forum/viewtopic.php?t=10532
@ -1246,17 +1274,22 @@ class KmlSrvImpl : public KmlServer {
assert( xml->isEmptyElement() );
const char * strKey = xml->getAttributeValue(FLDIGI_TAG_KEY);
if(strKey == NULL ) {
LOG_INFO("Null item key");
if (bMOREINFO)
LOG_INFO("Null item key");
break ;
}
const char * strVal = xml->getAttributeValue(FLDIGI_TAG_VAL);
if(strVal == NULL ) {
LOG_INFO("Null item value");
if (bMOREINFO)
LOG_INFO("Null item value");
break ;
}
currCustData.Push( strKey, strVal );
}
else LOG_INFO("Unexpected %s in event. currState=%s", nodeName, KmlRdToStr(currState) );
else
if (bMOREINFO)
LOG_INFO("Unexpected %s in event. currState=%s",
nodeName, KmlRdToStr(currState) );
break;
default:
break;
@ -1267,19 +1300,23 @@ class KmlSrvImpl : public KmlServer {
if( ! avoidNode.empty() ) {
const char * msgTxt = xml->getNodeData();
if( avoidNode == msgTxt ) {
// LOG_INFO("Leaving forbidden element %s. currState=%s", avoidNode.c_str(), KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO("Leaving forbidden element %s. currState=%s", avoidNode.c_str(), KmlRdToStr(currState) );
// We can leave the quarantine.
avoidNode.clear();
} else {
// LOG_INFO("Still in forbidden element %s, leaving %s. currState=%s",
// avoidNode.c_str(), msgTxt, KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO("Still in forbidden element %s, leaving %s. currState=%s",
avoidNode.c_str(), msgTxt, KmlRdToStr(currState) );
break ;
}
}
// We should check that this string matches wuth the state expects, but this is much
// faster to use only integers.
// LOG_INFO("End of %s currState=%s", xml->getNodeData(), KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO("End of %s currState=%s",
xml->getNodeData(), KmlRdToStr(currState) );
switch(currState) {
case KMLRD_FOLDER :
currState = KMLRD_NONE ;
@ -1323,7 +1360,8 @@ class KmlSrvImpl : public KmlServer {
LOG_ERROR("Should not happen %s", KmlRdToStr(currState));
break;
}
// LOG_INFO("currState=%s", KmlRdToStr(currState) );
if (bMOREINFO)
LOG_INFO("currState=%s", KmlRdToStr(currState) );
break;
}
case EXN_NONE:
@ -1337,18 +1375,22 @@ class KmlSrvImpl : public KmlServer {
}
}
LOG_INFO("kmlFilNam=%s loaded sz=%d", kmlFilNam.c_str(), (int)ptrMap->size() );
if (bMOREINFO)
LOG_INFO("kmlFilNam=%s loaded sz=%d",
kmlFilNam.c_str(), (int)ptrMap->size() );
} // KmlSrvImpl::ReloadSingleKmlFile
/// Rewrites only the categories which have changed.
bool RewriteKmlFileFull(void) {
bool wasSaved = false ;
// LOG_INFO("nb_categories=%d", nb_categories );
if (bMOREINFO)
LOG_INFO("nb_categories=%d", nb_categories );
for( size_t i = 0; i < nb_categories; ++i ) {
const char * category = categories[i];
PlacesMapT *ptrMap = m_placemarks.FindCategory( category );
if( ptrMap == NULL ) {
LOG_INFO("Category %s undefined", category );
if (bMOREINFO)
LOG_INFO("Category %s undefined", category );
continue;
}
ptrMap->PruneKmlFile( m_retention_delay );
@ -1403,7 +1445,7 @@ class KmlSrvImpl : public KmlServer {
tmp_tim.tv_sec = time(NULL) + refresh_delay;
tmp_tim.tv_nsec = 0 ;
// LOG_INFO("About to wait %d seconds", refresh );
//LOG_INFO("About to wait %d seconds", refresh );
r = pthread_cond_timedwait( &m_cond_queue, &m_mutex_write, &tmp_tim );
if( ( r != ETIMEDOUT ) && ( r != 0 ) ) {
LOG_ERROR("pthread_cond_timedwait %s d=%d", strerror(errno), m_refresh_interval );
@ -1417,7 +1459,8 @@ class KmlSrvImpl : public KmlServer {
MilliSleep( 1000 );
if( m_kml_must_leave )
{
LOG_INFO("Exit flag detected. Leaving");
if (bMOREINFO)
LOG_INFO("Exit flag detected. Leaving");
return (void *)"Exit flag detected";
}
}
@ -1436,7 +1479,8 @@ class KmlSrvImpl : public KmlServer {
return (void *)error_message ;
}
--nb_retries ;
LOG_INFO("KML server not ready yet. Cnt=%d. Restarting.",nb_retries);
if (bMOREINFO)
LOG_INFO("KML server not ready yet. Cnt=%d. Restarting.",nb_retries);
MilliSleep(1000); // Give time to load data.
continue ;
}
@ -1446,18 +1490,20 @@ class KmlSrvImpl : public KmlServer {
{
PlacesMapT *ptrMap = m_placemarks.FindCategory( categories[i] );
if( ptrMap == NULL ) {
LOG_INFO("Category %s undefined", categories[i] );
if (bMOREINFO)
LOG_INFO("Category %s undefined", categories[i] );
continue;
}
// TODO: If there are contention problems, internally swap the queue
// with a fresh empty one.
ptrMap->FlushQueue( m_merge_dist );
}
// LOG_INFO("Releasing lock" );
if (bMOREINFO)
LOG_INFO("Releasing lock" );
}
if( r == ETIMEDOUT )
{
// LOG_INFO("Saving after wait=%d", refresh );
//LOG_INFO("Saving after wait=%d", refresh );
bool wasSaved = RewriteKmlFileFull();
// Maybe a user process must be created to process these KML files.
@ -1471,7 +1517,7 @@ class KmlSrvImpl : public KmlServer {
} else {
refresh_delay = tmp_tim.tv_sec - time(NULL);
if( refresh_delay <= 0 ) refresh_delay = 1 ;
// LOG_INFO("Interrupted when waiting. Restart with wait=%d", refresh );
//LOG_INFO("Interrupted when waiting. Restart with wait=%d", refresh );
#endif
}
} // Endless loop.
@ -1512,8 +1558,10 @@ public:
m_refresh_interval = kml_refresh_interval ;
m_balloon_style = kml_balloon_style ;
LOG_INFO("dir=%s merge_distance=%lf retention_delay=%d refresh_interval=%d balloon_style=%d",
kml_dir.c_str(), kml_merge_distance, kml_retention_delay, kml_refresh_interval, kml_balloon_style );
if (bMOREINFO)
LOG_INFO("dir=%s merge_distance=%lf retention_delay=%d refresh_interval=%d balloon_style=%d",
kml_dir.c_str(), kml_merge_distance,
kml_retention_delay, kml_refresh_interval, kml_balloon_style );
m_kml_dir = kml_dir ;
@ -1544,14 +1592,14 @@ public:
try {
ReloadSingleKmlFile( categories[i] );
} catch( const std::exception & exc ) {
LOG_INFO("Category %s. Caught %s", categories[i], exc.what() );
LOG_ERROR("Category %s. Caught %s", categories[i], exc.what() );
}
}
// Now the object is usable. Theoretically should be protected by a mutex.
LOG_DEBUG("Object ready");
/// Even if an exception was thrown when loading the previous file, it does not
/// Even if an exception was thrown when loading the previous file, it does not
/// prevent to overwrite the old files with new and clean ones.
m_loaded = true ;
}
@ -1618,32 +1666,38 @@ public:
#else
m_bool_queue = true;
#endif
LOG_INFO("'%s' sz=%d time=%s nb_broad=%d m_merge_dist=%lf",
descrTxt.c_str(), (int)ptrMap->size(),
KmlTimestamp(evtTim).c_str(),
KmlServer::m_nb_broadcasts,m_merge_dist );
if (bMOREINFO)
LOG_INFO("'%s' sz=%d time=%s nb_broad=%d m_merge_dist=%lf",
descrTxt.c_str(), (int)ptrMap->size(),
KmlTimestamp(evtTim).c_str(),
KmlServer::m_nb_broadcasts,m_merge_dist );
}
/// It flushes the content to disk.
~KmlSrvImpl() {
{
/// This will not be killed in the middle of the writing.
LOG_INFO("Cancelling writer thread");
if (bMOREINFO)
LOG_INFO("Cancelling writer thread");
guard_lock myGuard( &m_mutex_write );
#ifdef FLDIGI_KML_CONDITION_VARIABLE
LOG_INFO("Cancelling subthread");
if (bMOREINFO)
LOG_INFO("Cancelling subthread");
int r = pthread_cancel( m_writer_thread );
if( r ) {
LOG_ERROR("pthread_cancel %s", strerror(errno) );
if (bMOREINFO)
LOG_ERROR("pthread_cancel %s", strerror(errno) );
return ;
}
#else
LOG_INFO("Setting exit flag.");
if (bMOREINFO)
LOG_INFO("Setting exit flag.");
m_kml_must_leave = true ;
#endif
}
// LOG_INFO("Joining subthread");
if (bMOREINFO)
LOG_INFO("Joining subthread");
void * retPtr;
int r = pthread_join( m_writer_thread, &retPtr );
if( r ) {
@ -1656,7 +1710,8 @@ public:
: (retPtr == PTHREAD_CANCELED)
? "Canceled thread"
: static_cast<const char *>(retPtr);
LOG_INFO("Thread stopped. Message:%s", msg );
if (bMOREINFO)
LOG_INFO("Thread stopped. Message:%s", msg );
/// Here we are sure that the subthread is stopped. The subprocess is not called.
RewriteKmlFileFull();
@ -1687,7 +1742,9 @@ public:
if( is_proc_still_running == -1 ) return ;
if( ( m_pid_command <= 0 ) || ( is_proc_still_running == 0 ) ) {
m_pid_command = fork_process( m_command.c_str() );
LOG_INFO("%s: Pid=%d Command=%s", __FUNCTION__, m_pid_command, m_command.c_str() );
if (bMOREINFO)
LOG_INFO("%s: Pid=%d Command=%s",
__FUNCTION__, m_pid_command, m_command.c_str() );
}
}
@ -1741,7 +1798,8 @@ void KmlServer::SpawnProcess() {
/// Called by thr main program, clean exit.
void KmlServer::Exit(void) {
// We assume that the calling program has no try/catch handler.
// LOG_INFO("Exiting");
if (bMOREINFO)
LOG_INFO("Exiting");
try {
KmlServer * pKml = Pointer();
if( pKml ) {

20
src/misc/record_loader.cxx
Wyświetl plik

@ -60,7 +60,8 @@ int RecordLoaderInterface::LoadAndRegister()
std::string filnam = storage_filename().first;
time_t cntTim = time(NULL);
LOG_INFO("Opening:%s", filnam.c_str());
if (bMOREINFO)
LOG_INFO("Opening:%s", filnam.c_str());
std::ifstream ifs( filnam.c_str() );
@ -93,8 +94,10 @@ int RecordLoaderInterface::LoadAndRegister()
}
}
ifs.close();
LOG_INFO( "Read:%s with %d records in %d seconds",
filnam.c_str(), static_cast<int>(nbRec), static_cast<int>( time(NULL) - cntTim ) );
if (bMOREINFO)
LOG_INFO( "Read:%s with %d records in %d seconds",
filnam.c_str(), static_cast<int>(nbRec),
static_cast<int>( time(NULL) - cntTim ) );
return nbRec ;
}
@ -219,7 +222,9 @@ std::pair< std::string, bool > RecordLoaderInterface::storage_filename(bool crea
// Second try with a file maybe installed by "make install".
std::string filnam_inst = PKGDATADIR "/" + base_filename();
LOG_INFO("Errno=%s with %s. Trying %s", strerror(errno), filnam_data.c_str(), filnam_inst.c_str() );
if (bMOREINFO)
LOG_INFO("Errno=%s with %s. Trying %s",
strerror(errno), filnam_data.c_str(), filnam_inst.c_str() );
ifs.open( filnam_inst.c_str() );
if( ifs )
{
@ -449,7 +454,9 @@ void DerivedRecordLst::cbGuiUpdate()
double timeout=600.0;
// Consider truncating the HTTP header.
int res = fetch_http_gui(url, reply, timeout );
LOG_INFO("Loaded %s : %d chars. res=%d", url.c_str(), (int)reply.size(), res );
if (bMOREINFO)
LOG_INFO("Loaded %s : %d chars. res=%d",
url.c_str(), (int)reply.size(), res );
if( ! res )
{
int ok = fl_choice2(
@ -526,7 +533,8 @@ void DerivedRecordLst::cbGuiReset()
fl_alert("Cannot erase installed data file %s", stofil );
continue ;
} else {
LOG_INFO("Erasing %s", stofil );
if (bMOREINFO)
LOG_INFO("Erasing %s", stofil );
int res = ::remove( stofil );
if( ( res != 0 ) && ( res != ENOENT ) ) {
fl_alert("Error erasing data file %s:%s", stofil, strerror(errno) );

234
src/synop-src/synop.cxx
Wyświetl plik

@ -113,7 +113,7 @@ static int diffTm( time_t tim1, time_t tim2 )
static std::string Tm2SynopTime( time_t tim ) {
return KmlServer::Tm2Time( tim );
}
// ----------------------------------------------------------------------------
/// Base class for displaying the key-value pairs read from Synop broadcast.
@ -219,7 +219,7 @@ class RecordWmoStation
// WMO Region :digits 1 through 6 representing the corresponding WMO region, 7 stands for the WMO Antarctic region.
// Station Latitude or Latitude :DD-MM-SSH where DD is degrees, MM is minutes, SS is seconds
// Station Latitude or Latitude :DD-MM-SSH where DD is degrees, MM is minutes, SS is seconds
// and H is N for northern hemisphere or S for southern hemisphere or
// E for eastern hemisphere or W for western hemisphere.
// The seconds value is omitted for those stations where the seconds value is unknown.
@ -253,7 +253,8 @@ public:
/// This garantees an unique name.
const std::string & station_name() const { return m_name; }
void rename_station( const std::string & nam ) {
// LOG_INFO("Renaming %s to %s", m_name.c_str(), nam.c_str() );
if (bMOREINFO)
LOG_INFO("Renaming %s to %s", m_name.c_str(), nam.c_str() );
m_name = nam;
}
@ -280,7 +281,7 @@ public:
&& ( rec.m_station_coordinates.latitude().is_lon() == false )
&& ( rec.m_station_coordinates.longitude().is_lon() == true )
)
)
{
strtrim( rec.m_name );
return istrm ;
@ -362,7 +363,7 @@ public:
&& read_until_delim( m_delim, istrm, rec.m_timezone )
&& read_until_delim( m_delim, istrm, rec.m_forecast )
&& read_until_delim( m_delim, istrm, rec.m_note )
)
)
{
// std::cout << "id=" << rec.m_id << " name=" << rec.m_name << "\n";
return istrm ;
@ -403,7 +404,7 @@ public:
&& read_until_delim( m_delim, istrm )
&& read_until_delim( m_delim, istrm )
&& read_until_delim( m_delim, istrm )
)
)
{
strtrim( rec.m_country );
strtrim( rec.m_callsign );
@ -478,7 +479,7 @@ public:
&& read_until_delim( m_delim, istrm /* Alloc Date */ )
&& read_until_delim( m_delim, istrm /* Dealloc Date */ )
&& read_until_delim( m_delim, istrm /* Argos Prog */ )
)
)
{
return istrm ;
}
@ -537,7 +538,8 @@ protected:
return false ;
}
else {
LOG_INFO("record=%s nb_recs=%d", typeid(Record).name(), nbRec );
if (bMOREINFO)
LOG_INFO("record=%s nb_recs=%d", typeid(Record).name(), nbRec );
return true ;
}
}
@ -587,8 +589,9 @@ public:
typedef std::multimap< std::string, IteratorType > HashT ;
HashT allNames ;
// First take the names
// LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
// First take the names
if (bMOREINFO)
LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
for( IteratorType it = m_catalog.begin(), en = m_catalog.end(); it != en; ++it )
{
RecordWmoStation & refWmo = it->second ;
@ -600,7 +603,8 @@ public:
// Iterates on all names, take only the duplicates.
for( HashT::iterator itH = allNames.begin(), itNextH = itH, enH = allNames.end(); itH != enH; itH = itNextH )
{
// LOG_INFO("Name=%s", itH->first.c_str() );
if (bMOREINFO)
LOG_INFO("Name=%s", itH->first.c_str() );
size_t nbKeys = 1 ;
for(;;) {
++itNextH;
@ -608,13 +612,15 @@ public:
if( itNextH->first != itH->first ) break ;
++nbKeys;
}
// LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
if (bMOREINFO)
LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
// If no duplicates, then try next one.
if( nbKeys == 1 ) continue ;
++nbDupl ;
// LOG_INFO("%d: Name %s %d occurrences", nbDupl, itH->first.c_str(), nbKeys );
if (bMOREINFO)
LOG_INFO("%d: Name %s %d occurrences", nbDupl, itH->first.c_str(), nbKeys );
// There should not be many elements, two or three duplicates, maximum five apparently.
typedef std::set< std::string > DiffNamesT ;
@ -622,7 +628,8 @@ public:
// Check that all countries are different.
for( HashT::iterator itSubH = itH; itSubH != itNextH; ++itSubH ) {
RecordWmoStation & refWmo = itSubH->second->second ;
// LOG_INFO("Trying %s", refWmo.station_name().c_str() );
if (bMOREINFO)
LOG_INFO("Trying %s", refWmo.station_name().c_str() );
// Appends the country.
refWmo.rename_station( refWmo.station_name() + "," + refWmo.country() );
std::pair< DiffNamesT::iterator, bool > tmpPair = differentNames.insert( refWmo.station_name() );
@ -637,7 +644,9 @@ public:
}
if(nbDupl) {
LOG_INFO("Eliminated %d duplicates out of %d elements", (int)nbDupl, (int)m_catalog.size());
if (bMOREINFO)
LOG_INFO("Eliminated %d duplicates out of %d elements",
(int)nbDupl, (int)m_catalog.size());
}
return true ;
}
@ -668,9 +677,10 @@ public:
typedef std::multimap< std::string, IteratorType > HashT ;
HashT allNames ;
// LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
if (bMOREINFO)
LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
/// First take the names
/// First take the names
for( IteratorType it = m_catalog.begin(), en = m_catalog.end(); it != en; ++it )
{
RecordBuoy & refWmo = it->second ;
@ -682,7 +692,8 @@ public:
/// Iterates on all names, take only the duplicates.
for( HashT::iterator itH = allNames.begin(), itNextH = itH, enH = allNames.end(); itH != enH; itH = itNextH )
{
// LOG_INFO("Name=%s", itH->first.c_str() );
if (bMOREINFO)
LOG_INFO("Name=%s", itH->first.c_str() );
size_t nbKeys = 1 ;
for(;;) {
++itNextH;
@ -690,13 +701,16 @@ public:
if( itNextH->first != itH->first ) break ;
++nbKeys;
}
// LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
if (bMOREINFO)
LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
// If no duplicates, then try next one.
if( nbKeys == 1 ) continue ;
++nbDupl ;
// LOG_INFO("%d: Buoy name %s %d occurrences", nbDupl, itH->first.c_str(), nbKeys );
if (bMOREINFO)
LOG_INFO("%d: Buoy name %s %d occurrences",
nbDupl, itH->first.c_str(), nbKeys );
// There should not be many elements, two or three duplicates, maximum five apparently.
typedef std::set< std::string > DiffNamesT ;
@ -710,7 +724,8 @@ public:
else
refBuoy.rename_buoy( strformat( "%s-%s", refBuoy.buoy_name().c_str(), refBuoy.id().c_str() ) );
std::pair< DiffNamesT::iterator, bool > tmpPair = differentNames.insert( refBuoy.buoy_name() );
// LOG_INFO("Buoy set to %s", refBuoy.buoy_name().c_str() );
if (bMOREINFO)
LOG_INFO("Buoy set to %s", refBuoy.buoy_name().c_str() );
if( tmpPair.second ) continue ;
LOG_ERROR("This should never happen because buoy id is unique");
return false ;
@ -718,7 +733,9 @@ public:
}
if(nbDupl) {
LOG_INFO("Eliminated %d duplicates out of %d elements", (int)nbDupl, (int)m_catalog.size());
if (bMOREINFO)
LOG_INFO("Eliminated %d duplicates out of %d elements",
(int)nbDupl, (int)m_catalog.size());
}
return true ;
}
@ -1098,7 +1115,7 @@ public:
strm << val ;
ItemAdd( key, strm.str().c_str(), unit );
}
void Append( const char * key, const std::string & val, const char * unit = NULL ) const
{
ItemAdd( key, val.c_str(), unit );
@ -1108,14 +1125,14 @@ public:
{
ItemAdd( key, val, unit );
}
void Append( const char * key, double val, const char * unit = NULL ) const
{
char buf[20];
sprintf( buf, "%.1lf", val );
ItemAdd( key, buf, unit );
}
void Append( const char * key, int val, const char * unit = NULL ) const
{
char buf[12];
@ -1193,7 +1210,7 @@ public:
}
/// Returns the regular expression given its index.
static const RegexT * Find(size_t idx ) {
static const RegexT * Find(size_t idx ) {
assert( idx < Nb() );
return storage()[ idx ];
}
@ -1230,7 +1247,7 @@ public:
// If two different tokens, with different regular expressions, match for the
// same word, the priority tells which one to take. Default value is one.
static priority_t Priority( size_t idx ) {
static priority_t Priority( size_t idx ) {
assert( idx < Nb() );
return storage()[ idx ]->m_priority;
}
@ -1278,7 +1295,7 @@ public:
/// Loops in the tokens held by the container, for a precise type.
template< class TokenDerived >
const TokenDerived * TokenProxy::get_ptr(bool previous_chains) const
const TokenDerived * TokenProxy::get_ptr(bool previous_chains) const
{
for(
TokVec::Ptr curr_container = m_container ;
@ -1571,7 +1588,7 @@ public:
/// http://weather.unisys.com/wxp/Appendices/Formats/SYNOP.html
/// 000 Group - Identification and Location
///
///
/// IIiii The WMO number of the station.
HEADTK(IIiii) {
int m_wmo_indicator ;
@ -1612,7 +1629,7 @@ public:
{
// std::cout << "wmo=" << str << "\n";
/* Station index numbers consisting of one figure repeated five times, e.g. 55555, 77777, etc.,
/* Station index numbers consisting of one figure repeated five times, e.g. 55555, 77777, etc.,
or ending with 0000 or 9999, or duplicating special code indicators, e.g. 10001, 77744, 19191,
89998, etc., are not assigned to meteorological stations. We might check if the code exists or not. */
if( 1 != sscanf( str, "%d", &m_wmo_indicator ) ) return false ;
@ -1895,7 +1912,7 @@ public:
}
/// Due to parsing error, we might take the next group header (333 or 555) as a ship name.
bool resu =
bool resu =
( 1 == sscanf( str, "%9s", m_ship_buoy_identifier ) )
&& ( strcmp( m_ship_buoy_identifier, "333" ) )
&& ( strcmp( m_ship_buoy_identifier, "555" ) );
@ -1926,7 +1943,7 @@ public:
const char * ShipIdentifier(void) const { return m_ship_buoy_identifier; }
};
/// ff -- wind speed in units determined by wind type indicator (see above)
/// ff -- wind speed in units determined by wind type indicator (see above)
static const choice< char > wind_speed_units[] = {
{ '0',_("m/s (Estimated)") },
{ '1',_("m/s (Anemometer)") },
@ -1977,7 +1994,7 @@ public:
// No need to display it twice because it will appear after the speed value.
if( tstDisp ) {
Append( _("Wind type indicator"),
Append( _("Wind type indicator"),
choice_map( wind_speed_units, G_N_ELEMENTS( wind_speed_units ),
m_wind_type_indicator, _("Unknown speed unit type") ) );
}
@ -2021,7 +2038,7 @@ public:
friend class CLASSTK(QLLLL);
};
/// LLLL -- Longitude of observation to .1 degrees
/// LLLL -- Longitude of observation to .1 degrees
HEADTK(QLLLL) {
char m_quadrant ;
int m_longit_10deg ;
@ -2246,13 +2263,13 @@ public:
const char * wind_speed_title = _("Wind speed");
if( ptr_YYGGi ) {
Append( wind_speed_title, m_wind_speed,
Append( wind_speed_title, m_wind_speed,
choice_map( wind_speed_units, G_N_ELEMENTS( wind_speed_units ),
ptr_YYGGi->m_wind_type_indicator, _("Unknown speed unit type") ) );
} else {
Append( wind_speed_title, m_wind_speed, _("No unit (YYGGi missing)") );
Append( wind_speed_title, m_wind_speed, _("No unit (YYGGi missing)") );
}
}
bool CanComeFirst(void) const { return false ; }
@ -2272,7 +2289,7 @@ public:
void Print() const {
// fff -- wind speed if value greater than 100
Append( _("Wind speed"), m_wind_speed );
Append( _("Wind speed"), m_wind_speed );
}
};
@ -2293,14 +2310,14 @@ static void AppCelsius( const TokenProxy * ptrTok, const char * title, char sign
if( title == NULL ) title = "No title";
switch( sign ) {
case '1' : temperature_tenth = -temperature_tenth ;
case '0' : ptrTok->Append( title, temperature_tenth * 0.10, Unit_Celsius );
case '1' : temperature_tenth = -temperature_tenth ;
case '0' : ptrTok->Append( title, temperature_tenth * 0.10, Unit_Celsius );
break;
case '9' : ptrTok->Append( _("Relative humidity"), (double)temperature_tenth * 0.10 , "%" );
break;
case '/' : ptrTok->Append( title, _("Undefined") );
case '/' : ptrTok->Append( title, _("Undefined") );
break;
default : ptrTok->Append( title, _("Unexpected case") );
default : ptrTok->Append( title, _("Unexpected case") );
break;
}
}
@ -2367,7 +2384,7 @@ static void thousands_omitted( const TokenProxy * ptrTok, const char * pressure,
double tmpPres ;
// Checks reasonable values for a pressure.
if( ( 1 != sscanf( buf, "%lf", &tmpPres ) )
|| ( tmpPres > 12000 )
|| ( tmpPres > 12000 )
|| ( tmpPres < 7000 ) ) {
ptrTok->Append( title, _("Inconsistent:") + std::string(pressure) );
} else {
@ -2392,7 +2409,7 @@ public:
};
/** 4PPPP -- Sea level pressure in 0.1 mb (thousandths digit omitted, last digit can be slash, then pressure in full mb)
Can be as well 4ahhh http://metaf2xml.sourceforge.net/parser.pm.html :
Can be as well 4ahhh http://metaf2xml.sourceforge.net/parser.pm.html :
a3 Isobaric surface (CT 0264), hhh Geopotential of isobaric surface
*/
HEADTK(4PPPP) {
@ -2965,7 +2982,7 @@ public:
}
};
/// 9GGgg -- Time of observation in hours and minutes
/// 9GGgg -- Time of observation in hours and minutes
HEADTK(9GGgg) {
int m_hours;
int m_minutes;
@ -2983,7 +3000,7 @@ public:
};
/// 222 Group - Sea Surface Observations
///
///
/// 222Dv
HEADTK(222Dv) {
char m_ship_direction;
@ -3088,9 +3105,9 @@ public:
Append( _("Sea surface temperature"), _("Unspecified") );
if( m_temperature_type == NULL )
Append( _("Temperature type"), _("Unspecified") );
Append( _("Temperature type"), _("Unspecified") );
else
Append( _("Temperature type"), m_temperature_type );
Append( _("Temperature type"), m_temperature_type );
}
};
@ -3194,7 +3211,7 @@ public:
m_swell_waves_period = -1;
m_swell_waves_height = -1;
if( 0 == strcmp( str, "4////") ) return true;
return ( 2 == sscanf( str, "4%2d%2d", &m_swell_waves_period, &m_swell_waves_height ) )
return ( 2 == sscanf( str, "4%2d%2d", &m_swell_waves_period, &m_swell_waves_height ) )
|| ( 1 == sscanf( str, "4%2d//", &m_swell_waves_period ) );
}
@ -3300,7 +3317,7 @@ public:
}
};
/// 8aTTT -- Wet bulb temperature
/// 8aTTT -- Wet bulb temperature
HEADTK(8aTTT) {
char m_wet_bulb_sign_type ;
char m_temperature_sign ;
@ -3362,7 +3379,7 @@ public:
}
};
/// Separator for ice detection.
/// Separator for ice detection.
HEADTK(ICE) {
public:
// TODO: It is possible to have free text after the string ICE.
@ -3394,7 +3411,7 @@ public:
bool Parse( const char * str )
{
return ( 5 == sscanf( str, "%c%c%c%c%c",
return ( 5 == sscanf( str, "%c%c%c%c%c",
&m_sea_ice_arrangement,
&m_sea_ice_development_stage,
&m_ice_of_land_origin,
@ -3419,7 +3436,7 @@ public:
_("Concentration or arrangement of Sea Ice") );
/// Si = Sea Ice Stage of Development
static const char * sea_ice_development_stages[] = {
static const char * sea_ice_development_stages[] = {
_("New ice only (frail ice, grease ice, slush ice, shuga)"),
_("Nilas or ice rind, less than 10 cm thick"),
_("Young ice (grey ice, grey-white ice), 10-30 cm thick"),
@ -3669,19 +3686,19 @@ public:
/// sss -- snow depth in cm: Code table 3889 sss : Total depth of snow
switch( m_snow_depth ) {
case 0 :
case 0 :
Append( _("Snow depth"), _("Not used") );
break;
default :
Append( _("Snow depth"), m_snow_depth, Unit_centimeters );
break;
case 997 :
case 997 :
Append( _("Snow depth"), _("Less than 0.5 cm") );
break;
case 998 :
case 998 :
Append( _("Snow depth"), _("Snow cover, not continuous") );
break;
case 999 :
case 999 :
Append( _("Snow depth"), _("Measurement impossible or inaccurate") );
break;
}
@ -3880,7 +3897,7 @@ public:
m_cloud_base_height = 0 ;
return ( 3 == sscanf( str, "8%c%c%2d", &m_cloud_cover, &m_cloud_genus, &m_cloud_base_height ) )
|| ( 2 == sscanf( str, "8%c%c//", &m_cloud_cover, &m_cloud_genus ) )
|| ( 0 == strncmp( str, "80///", 5 ) );
|| ( 0 == strncmp( str, "80///", 5 ) );
}
void Print() const {
@ -3896,9 +3913,9 @@ public:
switch( m_cloud_base_height ) {
case 0 : Append( title, _("Less than 30 meters") ); break;
case 1 ... 50 : Append( title, m_cloud_base_height * 30, Unit_meters ); break;
case 51 ... 56 : Append( title, 1500 + ( m_cloud_base_height - 50 ) * 50, Unit_meters ); break;
case 57 ... 80 : Append( title, 1800 + ( m_cloud_base_height - 56 ) * 300, Unit_meters ); break;
case 81 ... 88 : Append( title, 9000 + ( m_cloud_base_height - 80 ) * 1500, Unit_meters ); break;
case 51 ... 56 : Append( title, 1500 + ( m_cloud_base_height - 50 ) * 50, Unit_meters ); break;
case 57 ... 80 : Append( title, 1800 + ( m_cloud_base_height - 56 ) * 300, Unit_meters ); break;
case 81 ... 88 : Append( title, 9000 + ( m_cloud_base_height - 80 ) * 1500, Unit_meters ); break;
case 89 : Append( title, _("Greater than 21000 m") ); break;
case 90 ... 99 : disp_arr(cloud_bases,G_N_ELEMENTS(cloud_bases),m_cloud_base_height,90,title );
break;
@ -3907,7 +3924,7 @@ public:
}
};
/// 9SSss -- Supplementary information
/// 9SSss -- Supplementary information
/// http://www.met.fu-berlin.de/~stefan/fm12.html#32
/// 9SPSPspsp -- Besondere Wettererscheinungen und zusätzliche Informationen (Gruppe kann mehrmals verschlüsselt werden)
HEADTK(9SSss) {
@ -4454,7 +4471,7 @@ public:
* 9snTgTgTgsTg -- Minimumtemperatur des Vortags (00 - 24 UTC) 5 cm über dem Erdboden bzw. der Schneedecke (wird um 06 UTC gemeldet)
sn -- Vorzeichen der Temperatur (0 = positiv, 1 = negativ)
Tg Tg Tg -- Erdbodenminimumtemperatur in 1/10 Grad Celsius
sTg -- Bedeckung des Temperaturmeßfühlers 5 cm über dem Erdboden mit Schnee oder Eis am Vortag (0 = nein, 1 = ja, / = Angabe nicht möglich)
sTg -- Bedeckung des Temperaturmeßfühlers 5 cm über dem Erdboden mit Schnee oder Eis am Vortag (0 = nein, 1 = ja, / = Angabe nicht möglich)
*/
/// Abschnitt 6 - Automatisch erzeugte Daten
@ -4923,43 +4940,43 @@ static const void init_patterns(void)
// http://metaf2xml.sourceforge.net/parser.pm.html
// AT: 1snTxTxTx 6RRR/
// 1snTxTxTx : maximum temperature on the previous day from 06:00 to 18:00 UTC
// 6RRR/ : amount of precipitation on the previous day from 06:00 to 18:00 UTC
// 1snTxTxTx : maximum temperature on the previous day from 06:00 to 18:00 UTC
// 6RRR/ : amount of precipitation on the previous day from 06:00 to 18:00 UTC
// BE: 1snTxTxTx 2snTnTnTn
// 1snTxTxTx : maximum temperature on the next day from 00:00 to 24:00 UTC
// 2snTnTnTn : minimum temperature on the next day from 00:00 to 24:00 UTC
// 1snTxTxTx : maximum temperature on the next day from 00:00 to 24:00 UTC
// 2snTnTnTn : minimum temperature on the next day from 00:00 to 24:00 UTC
// CA: 1ssss 2swswswsw 3dmdmfmfm 4fhftftfi
// 1ssss : amount of snowfall, in tenths of a centimeter, for the 24-hour period ending at 06:00 UTC
// 2swswswsw : amount of water equivalent, in tenths of a millimeter, for the 24-hour snowfall ending at 06:00 UTC
// 3dmdmfmfm : maximum (mean or gust) wind speed, in knots, for the 24-hour period ending at 06:00 UTC and its direction
// 1ssss : amount of snowfall, in tenths of a centimeter, for the 24-hour period ending at 06:00 UTC
// 2swswswsw : amount of water equivalent, in tenths of a millimeter, for the 24-hour snowfall ending at 06:00 UTC
// 3dmdmfmfm : maximum (mean or gust) wind speed, in knots, for the 24-hour period ending at 06:00 UTC and its direction
// 4fhftftfi : together with the previous group, the hundreds digit of the maximum wind speed (in knots),
// the time of occurrence of the maximum wind speed, and the speed range
// of the maximum two-minute mean wind speed, for the 24-hour period ending at 06:00 UTC and its direction
// of the maximum two-minute mean wind speed, for the 24-hour period ending at 06:00 UTC and its direction
// US land: RECORD* 0ittDtDtD 1snTT snTxTxsnTnTn RECORD* 2R24R24R24R24 44snTwTw 9YYGG
// RECORD : indicator for temperature record(s)
// 0ittDtDtD : tide data
// RECORD : indicator for temperature record(s)
// 0ittDtDtD : tide data
// 1snTT snTxTxsnTnTn RECORD* 2R24R24R24R24 : city data: temperature, maximum and minimum temperature,
// indicator for temperature record(s), precipitation last 24 hours
// 44snTwTw : water temperature
// 9YYGG : additional day and hour of observation (repeated from Section 0)
// indicator for temperature record(s), precipitation last 24 hours
// 44snTwTw : water temperature
// 9YYGG : additional day and hour of observation (repeated from Section 0)
// US sea: 11fff 22fff 3GGgg 4ddfmfm 6GGgg dddfff dddfff dddfff dddfff dddfff dddfff 8ddfmfm 9GGgg
// 11fff 22fff : equivalent wind speeds at 10 and 20 meters
// 3GGgg 4ddfmfm : maximum wind speed since the last observation and the time when it occurred
// 6GGgg : end time of the latest 10-minute continuous wind measurements
// 6 x dddfff : 6 10-minute continuous wind measurements
// 8ddfmfm 9GGgg : highest 1-minute wind speed and the time when it occurred
// 11fff 22fff : equivalent wind speeds at 10 and 20 meters
// 3GGgg 4ddfmfm : maximum wind speed since the last observation and the time when it occurred
// 6GGgg : end time of the latest 10-minute continuous wind measurements
// 6 x dddfff : 6 10-minute continuous wind measurements
// 8ddfmfm 9GGgg : highest 1-minute wind speed and the time when it occurred
// CZ: 1dsdsfsfs 2fsmfsmfsxfsx 3UU// 5snT5T5T5 6snT10T10T10 7snT20T20T20 8snT50T50T50 9snT100T100T100
// 1dsdsfsfs : wind direction and speed from tower measurement
// 2fsmfsmfsxfsx : maximum wind gust speed over 10 minute period and the period W1W2
// 3UU// : relative humidity
// 5snT5T5T5 6snT10T10T10 7snT20T20T20 8snT50T50T50 9snT100T100T100 : soil temperature at the depths of 5, 10, 20, 50, and 100 cm
// 1dsdsfsfs : wind direction and speed from tower measurement
// 2fsmfsmfsxfsx : maximum wind gust speed over 10 minute period and the period W1W2
// 3UU// : relative humidity
// 5snT5T5T5 6snT10T10T10 7snT20T20T20 8snT50T50T50 9snT100T100T100 : soil temperature at the depths of 5, 10, 20, 50, and 100 cm
// RU: 1EsnT'gT'g 2snTnTnTn 3EsnTgTg 4E'sss 52snT2T2 6RRRtR 7R24R24R24/ 88R24R24R24
// 1EsnT'gT'g : state of the ground without snow or measurable ice cover, temperature of the ground surface
// 2snTnTnTn : minimum temperature last night
// 3EsnTgTg : state of the ground without snow or measurable ice cover, minimum temperature of the ground surface last night
// 4E'sss : state of the ground if covered with snow or ice, snow depth
// 6RRRtR : amount of precipitation for given period
// 7R24R24R24/ : amount of daily precipitation
// 1EsnT'gT'g : state of the ground without snow or measurable ice cover, temperature of the ground surface
// 2snTnTnTn : minimum temperature last night
// 3EsnTgTg : state of the ground without snow or measurable ice cover, minimum temperature of the ground surface last night
// 4E'sss : state of the ground if covered with snow or ice, snow depth
// 6RRRtR : amount of precipitation for given period
// 7R24R24R24/ : amount of daily precipitation
// 88R24R24R24 : amount of daily precipitation if 30 mm or more
@ -5070,7 +5087,7 @@ class synop_impl
std::cout << "DEBUG:" << __FUNCTION__
<< " m_idxGroup=" << m_idxGroup << " m_idxTok=" << m_idxTok
<< " reg=" << reg.Name() << " str=" << str
<< " m_nxtTok=" << m_nxtTok
<< " m_nxtTok=" << m_nxtTok
<< " priority=" << m_sum_prios << "\n" ;
*/
return tp ;
@ -5093,8 +5110,8 @@ class synop_impl
std::cout << "DEBUG:" << __FUNCTION__
<< " REPET m_idxGroup=" << m_idxGroup << " m_idxTok=" << m_idxTok
<< " reg=" << reg.Name() << " str=" << str
<< " m_nxtTok=" << m_nxtTok
<< " m_idxTok=" << m_idxTok
<< " m_nxtTok=" << m_nxtTok
<< " m_idxTok=" << m_idxTok
<< " maxTks=" << ptrSynopGroup->m_nb_toks
<< " priority=" << m_sum_prios << "\n" ;
*/
@ -5200,7 +5217,7 @@ class synop_impl
LOG_DEBUG("No publish0 empty message");
return;
}
// Quick check if the message is very short. Beware, it it the total
// number of tokens, not the number of sections.
if(m_nbTokens <= 2 ) {
@ -5211,7 +5228,7 @@ class synop_impl
// We eliminate this kind of message which is not SYNOP although the beginning is similar.
// Other simple combinations might be eliminated but they are rarer.
// ZCZC 603
// ZCZC 603
// WWXX60 EDZW 201700
const_iterator it1 = it0;
++it1 ;
@ -5220,7 +5237,8 @@ class synop_impl
&& ( it1 != end() )
&& ( it1->section() == SECTION_IDENTLOC ) ) {
if( m_nbTokens <= 3 ) {
LOG_INFO("No publish3 %s", TstToStr().c_str() );
if (bMOREINFO)
LOG_INFO("No publish3 %s", TstToStr().c_str() );
return ;
}
// TODO: Store these for next run if their are missing.
@ -5230,7 +5248,8 @@ class synop_impl
// For example, receiving only the following line makes no sense:
// Climatological data=6RRRt#69907+8NChh#81822+9SSss#91113+9SSss#96480;+;
if( it0->section() != SECTION_LAND_OBS ) {
LOG_INFO("No publish2 %s", TstToStr().c_str() );
if (bMOREINFO)
LOG_INFO("No publish2 %s", TstToStr().c_str() );
return ;
}
// TODO: We should use the header SECTION_IDENTLOC of the previous message:
@ -5307,7 +5326,8 @@ class synop_impl
<< " IIiii:" << newCoo
<< " Against:" << tmpCoo
<< " Dist:" << dist ;
LOG_INFO("%s", strm.str().c_str() );
if (bMOREINFO)
LOG_INFO("%s", strm.str().c_str() );
}
} else {
foundCoo = true ;
@ -5344,7 +5364,8 @@ class synop_impl
<< " IIiii:" << newCoo
<< " Against:" << tmpCoo
<< " Dist:" << dist ;
LOG_INFO("%s", strm.str().c_str() );
if (bMOREINFO)
LOG_INFO("%s", strm.str().c_str() );
}
} else {
foundCoo = true ;
@ -5359,7 +5380,8 @@ class synop_impl
ptrJComm_Tok->SetJCommFields( kmlNam, iconNam );
if( stationCountry.empty() ) stationCountry = ptrJComm_Tok->country();
} else {
LOG_INFO("Cannot find WMO station:%s", wmoIndicStr.c_str() );
if (bMOREINFO)
LOG_INFO("Cannot find WMO station:%s", wmoIndicStr.c_str() );
kmlNam = "WMO:" + wmoIndicStr ;
}
}
@ -5711,7 +5733,7 @@ private:
const size_t buf_sz = m_buf.size();
// The same list can appear in several chains, this is intended.
for( int i = 0, nbSynGrp = arrSynopGroups.size(); i < nbSynGrp; ++i )
for( int i = 0, nbSynGrp = arrSynopGroups.size(); i < nbSynGrp; ++i )
{
for( size_t j = 0, nbToks = arrSynopGroups[i].m_nb_toks; j < nbToks; ++j )
{
@ -5800,7 +5822,7 @@ private:
/// What happens if it matches the beginning if a chain
// NOTE: We suppose that the beginning is never multiple ("Many").
for( int idxGrp = 0, nbSynGrp = arrSynopGroups.size(); idxGrp < nbSynGrp; ++idxGrp )
for( int idxGrp = 0, nbSynGrp = arrSynopGroups.size(); idxGrp < nbSynGrp; ++idxGrp )
{
const synop_group * ptrSynopGroup = &arrSynopGroups[idxGrp];
assert( ptrSynopGroup->m_nb_toks > 0 );
@ -5839,7 +5861,7 @@ private:
if( nbInserts != 0 ) {
/// Removes the chains which cannot possibly match the current suite of tokens.
for( ChainsNoInsrtsT::iterator it = chainsNoInsrts.begin(), en = chainsNoInsrts.end(); it != en; ++it )
for( ChainsNoInsrtsT::iterator it = chainsNoInsrts.begin(), en = chainsNoInsrts.end(); it != en; ++it )
{
m_chains.erase( *it );
}
@ -5954,7 +5976,7 @@ public:
{
// -1, no display of '=', whose length is one.
decode_then_flush(-1);
} else if( nbInserts == 0 )
} else if( nbInserts == 0 )
{
if( noChains ) {
/// There was no chains before.
@ -6022,7 +6044,7 @@ void synop::regex_usage(void) {
if( ptrSynopGroup-> m_usage_counter > 0 ) continue ;
std::cout << "DEBUG:" << "Unused:"
<< " idxGrp=" << idxGrp
<< " idxGrp=" << idxGrp
<< ' ' << *ptrSynopGroup
<< '\n' ;
}