ObjectService.cpp   ObjectService.cpp 
skipping to change at line 119 skipping to change at line 119
response.writeJSON(QJsonDocument(QJsonArray::fromStringList( results))); response.writeJSON(QJsonDocument(QJsonArray::fromStringList( results)));
} }
else if (operation == "info") else if (operation == "info")
{ {
//retrieve HTML info string about a specific object //retrieve HTML info string about a specific object
//if no parameter is given, uses the currently selected obje ct //if no parameter is given, uses the currently selected obje ct
QString name = QString::fromUtf8(parameters.value("name")); QString name = QString::fromUtf8(parameters.value("name"));
QString formatStr = QString::fromUtf8(parameters.value("form at")); QString formatStr = QString::fromUtf8(parameters.value("form at"));
bool formatHtml; bool formatHtml;
if (formatStr == "map") if (formatStr == "map" || formatStr == "json")
formatHtml=false; formatHtml=false;
else else
formatHtml=true; formatHtml=true;
StelObjectP obj; StelObjectP obj;
if(!name.isEmpty()) if(!name.isEmpty())
{ {
QMetaObject::invokeMethod(this,"findObject",SERVICE_ DEFAULT_INVOKETYPE, QMetaObject::invokeMethod(this,"findObject",SERVICE_ DEFAULT_INVOKETYPE,
Q_RETURN_ARG(StelObjectP,o bj), Q_RETURN_ARG(StelObjectP,o bj),
Q_ARG(QString,name)); Q_ARG(QString,name));
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/