templates: Add PeerName field, part II

The Funambol template hadn't been updated and the command line
tests failed because the didn't expect the PeerName to be set.

The normalization of "= F" to "= 0" broke the "= Funambol" peer name.
Doesn't seem to server any useful purpose anymore, so removed.
This commit is contained in:
Patrick Ohly 2011-06-28 18:38:38 -07:00
parent edaa1562b5
commit 34e6667e14
2 changed files with 5 additions and 4 deletions

View file

@ -2168,8 +2168,6 @@ static string internalToIni(const string &config)
}
string assignment = line.substr(colon + 1);
// substitude aliases with generic values
boost::replace_first(assignment, "= F", "= 0");
boost::replace_first(assignment, "= T", "= 1");
boost::replace_first(assignment, "= syncml:auth-md5", "= md5");
boost::replace_first(assignment, "= syncml:auth-basix", "= basic");
res << assignment << endl;
@ -4225,7 +4223,7 @@ private:
"peers/scheduleworld/config.ini:# remoteIdentifier = \n"
"peers/scheduleworld/config.ini:# PeerIsClient = 0\n"
"peers/scheduleworld/config.ini:# SyncMLVersion = \n"
"peers/scheduleworld/config.ini:# PeerName = \n"
"peers/scheduleworld/config.ini:PeerName = ScheduleWorld\n"
"config.ini:deviceId = fixed-devid\n" /* this is not the default! */
"peers/scheduleworld/config.ini:# remoteDeviceId = \n"
"peers/scheduleworld/config.ini:# enableWBXML = 1\n"
@ -4340,7 +4338,7 @@ private:
"spds/syncml/config.txt:# remoteIdentifier = \n"
"spds/syncml/config.txt:# PeerIsClient = 0\n"
"spds/syncml/config.txt:# SyncMLVersion = \n"
"spds/syncml/config.txt:# PeerName = \n"
"spds/syncml/config.txt:PeerName = ScheduleWorld\n"
"spds/syncml/config.txt:deviceId = fixed-devid\n" /* this is not the default! */
"spds/syncml/config.txt:# remoteDeviceId = \n"
"spds/syncml/config.txt:# enableWBXML = 1\n"
@ -4389,6 +4387,7 @@ private:
string FunambolConfig() {
string config = ScheduleWorldConfig();
boost::replace_all(config, "/scheduleworld/", "/funambol/");
boost::replace_all(config, "PeerName = ScheduleWorld", "PeerName = Funambol");
boost::replace_first(config,
"syncURL = http://sync.scheduleworld.com/funambol/ds",
@ -4443,6 +4442,7 @@ private:
string SynthesisConfig() {
string config = ScheduleWorldConfig();
boost::replace_all(config, "/scheduleworld/", "/synthesis/");
boost::replace_all(config, "PeerName = ScheduleWorld", "PeerName = Synthesis");
boost::replace_first(config,
"syncURL = http://sync.scheduleworld.com/funambol/ds",

View file

@ -5,6 +5,7 @@ description = http://my.funambol.com
=== config.ini ===
syncURL = http://my.funambol.com/sync
WebURL = http://my.funambol.com
PeerName = Funambol
enableWBXML = FALSE
ConsumerReady = TRUE
RetryInterval = 0