added string_limit to xml to allow for super long strings - by default it is 100and <string_limit> is not required in the xml but will be take

pull/2/head v3.20.1.r112
James Coxon 2010-07-15 23:50:00 +01:00
rodzic a41e3bed74
commit f8e63f5aa4
5 zmienionych plików z 18 dodań i 2 usunięć

Wyświetl plik

@ -71,7 +71,7 @@ function copy_libs()
function bundle()
{
appname="${binary}-${appversion}.app"
appname="${binary}.app"
cd "$build"
# bundle the binary

Wyświetl plik

@ -1126,6 +1126,7 @@
ELEM_(int, xml_latitude, "", "", 0) \
ELEM_(int, xml_longitude, "", "", 0) \
ELEM_(int, xml_altitude, "", "", 0) \
ELEM_(int, xml_stringlimit, "", "", 100) \
/* GPS Device Info */ \
ELEM_(std::string, gpsDevice, "GPSDEVICE", "", "") \
ELEM_(int, gpsSpeed, "GPSSPEED", "", 4800) \

Wyświetl plik

@ -243,8 +243,13 @@ void rx_extract_add(int c)
// Old copy:
// if ((rx_buff.length() < total_string_length) and (number_commas == min_number_fields - 1)) {
if (progdefaults.xml_stringlimit > total_string_length)
{
total_string_length = progdefaults.xml_stringlimit;
}
// FIXME: For the purposes of testing we won't check min_number_fields
if (rx_buff.length() < total_string_length) {
string identity_callsign = (progdefaults.myCall.empty() ? "UNKNOWN" : progdefaults.myCall.c_str());
UpperCase (identity_callsign);

Wyświetl plik

@ -54,6 +54,7 @@ struct payload
char *sentence_delimiter;
char *field_delimiter;
int fields;
int string_limit;
char *callsign;
int shift;
int baud;
@ -701,6 +702,13 @@ void dl_fldigi_update_payloads()
xml->read();
}
else if (strcmp("string_limit", xml->getNodeName()) == 0)
{
xml->read();
p->string_limit = atoi(xml->getNodeData());
xml->read();
}
else if (strcmp("field_delimiter", xml->getNodeName()) == 0)
{
xml->read();
@ -1089,6 +1097,7 @@ void dl_fldigi_select_payload(const char *name)
print_s(name);
print_s(sentence_delimiter);
print_i(string_limit);
print_s(field_delimiter);
print_i(fields);
print_s(callsign);
@ -1116,6 +1125,7 @@ void dl_fldigi_select_payload(const char *name)
current_payload = p;
progdefaults.xmlSentence_delimiter = p->sentence_delimiter;
progdefaults.xml_stringlimit = p->string_limit;
progdefaults.xmlField_delimiter = p->field_delimiter;
progdefaults.xmlFields = p->fields;
progdefaults.xmlCallsign = p->callsign;