#include <stdlib.h> // atoi() atof()
#include STL_STRING
-#include STL_STRSTREAM
#include <simgear/debug/logstream.hxx>
#include <simgear/io/iochannel.hxx>
#include <simgear/math/sg_types.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/structure/commands.hxx>
+#include <simgear/props/props.hxx>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
#include "httpd.hxx"
SG_USING_STD(string);
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(cout);
-SG_USING_STD(istrstream);
-#endif
bool FGHttpd::open() {
server = new HttpdServer( port );
- set_hz( 5 ); // default to processing requests @ 5Hz
+ set_hz( 15 ); // default to processing requests @ 15Hz
set_enabled( true );
return true;
string a = arg.substr( 0, apos );
string b = arg.substr( apos + 1 );
printf(" a = %s b = %s\n", a.c_str(), b.c_str() );
- if ( a == "value" ) {
- fgSetString( request.c_str(), urlDecode(b).c_str() );
- }
+ if ( request == "/run.cgi" ) {
+ // execute a command
+ if ( a == "value" ) {
+ SGPropertyNode args;
+ if ( !globals->get_commands()
+ ->execute(urlDecode(b).c_str(), &args) )
+ {
+ SG_LOG( SG_GENERAL, SG_ALERT,
+ "Command " << urlDecode(b)
+ << " failed.");
+ }
+
+ }
+ } else {
+ if ( a == "value" ) {
+ // update a property value
+ fgSetString( request.c_str(),
+ urlDecode(b).c_str() );
+ }
+ }
}
}
} else {
if ( child->nChildren() > 0 ) {
line += "<B><A HREF=\"";
line += request;
- if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
+ if ( request.substr(request.length() - 1, 1) != "/" ) {
line += "/";
}
line += urlEncode(name);
line += name;
line += "</B> <A HREF=\"";
line += request;
- if ( request.substr(request.length() - 1, 1) != (string)"/" ) {
+ if ( request.substr(request.length() - 1, 1) != "/" ) {
line += "/";
}
line += urlEncode(name);