X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fprops.cxx;h=3692a5cfe6ec49fed2c8197df9d5c780b1b61c99;hb=7d3448294bc7486af3f4c1f0ff5c8493b03ffc90;hp=25c304fd51221814af1aec9d18b53c6a7fb4a1c3;hpb=32528d0cd65eb1aec904f25b692b2f961c028bfa;p=flightgear.git diff --git a/src/Network/props.cxx b/src/Network/props.cxx index 25c304fd5..3692a5cfe 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -21,15 +21,27 @@ // $Id$ + #include #include #include #include +#include +#include + +#include
+ +#include // atoi() atof() -#include +#include STL_STRSTREAM #include "props.hxx" +#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS) +SG_USING_STD(cout); +SG_USING_STD(istrstream); +SG_USING_STD(strstream); +#endif FGProps::FGProps() { } @@ -40,8 +52,10 @@ FGProps::~FGProps() { // open hailing frequencies bool FGProps::open() { + reset(); + if ( is_enabled() ) { - FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " + SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " << "is already in use, ignoring" ); return false; } @@ -49,18 +63,60 @@ bool FGProps::open() { SGIOChannel *io = get_io_channel(); if ( ! io->open( get_direction() ) ) { - FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." ); + SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." ); return false; } set_enabled( true ); + SG_LOG( SG_IO, SG_INFO, "Opening properties channel communication layer." ); return true; } +// prepare for new connection +bool FGProps::reset() { + path = "/"; + mode = PROMPT; + return true; +} + + +// return a human readable form of the value "type" +static string getValueTypeString( const SGPropertyNode *node ) { + string result; + + if ( node == NULL ) { + return "unknown"; + } + + SGPropertyNode::Type type = node->getType(); + if ( type == SGPropertyNode::UNSPECIFIED ) { + result = "unspecified"; + } else if ( type == SGPropertyNode::NONE ) { + result = "none"; + } else if ( type == SGPropertyNode::BOOL ) { + result = "bool"; + } else if ( type == SGPropertyNode::INT ) { + result = "int"; + } else if ( type == SGPropertyNode::LONG ) { + result = "long"; + } else if ( type == SGPropertyNode::FLOAT ) { + result = "float"; + } else if ( type == SGPropertyNode::DOUBLE ) { + result = "double"; + } else if ( type == SGPropertyNode::STRING ) { + result = "string"; + } + + return result; +} + + bool FGProps::process_command( const char *cmd ) { - cout << "processing command = " << cmd << endl; + SGIOChannel *io = get_io_channel(); + + cout << "processing command = " << cmd; string_list tokens; tokens.clear(); @@ -74,10 +130,154 @@ bool FGProps::process_command( const char *cmd ) { string command = tokens[0]; + SGPropertyNode * node = globals->get_props()->getNode(path.c_str()); + if ( command == "ls" ) { + SGPropertyNode * dir = node; + if ( tokens.size() > 2 ) { + if ( tokens[1][0] == '/' ) { + dir = globals->get_props()->getNode(tokens[1].c_str()); + } else { + dir = globals->get_props()->getNode((path + "/" + tokens[1]).c_str()); + } + if ( dir == 0 ) { + tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n"; + io->writestring( tokens[1].c_str() ); + return true; + } + } + for (int i = 0; i < (int)dir->nChildren(); i++) { + SGPropertyNode * child = dir->getChild(i); + string name = child->getName(); + string line = name; + if ( dir->getChild(name.c_str(), 1) ) { + char buf[16]; + sprintf(buf, "[%d]", child->getIndex()); + line += buf; + } + if ( child->nChildren() > 0 ) { + line += "/"; + } else { + if ( mode == PROMPT ) { + string value = dir->getStringValue ( name.c_str(), "" ); + line += " =\t'" + value + "'\t("; + line += getValueTypeString( dir->getNode( name.c_str() ) ); + line += ")"; + } + } + line += "\n"; + io->writestring( line.c_str() ); + } + } else if ( command == "dump" ) { + strstream buf; + if ( tokens.size() <= 1 ) { + writeProperties ( buf, node); + io->writestring( buf.str() ); + } + else { + SGPropertyNode *child = node->getNode(tokens[1].c_str()); + if ( child ) { + writeProperties ( buf, child ); + io->writestring( buf.str() ); + } else { + tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n"; + io->writestring( tokens[1].c_str() ); + } + } + } else if ( command == "cd" ) { + // string tmp = "current path = " + node.getPath() + "\n"; + // io->writestring( tmp.c_str() ); + + if ( tokens.size() <= 1 ) { + // do nothing + } else { + SGPropertyNode *child = node->getNode(tokens[1].c_str()); + if ( child ) { + node = child; + path = node->getPath(); + } else { + tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n"; + io->writestring( tokens[1].c_str() ); + } + } + } else if ( command == "pwd" ) { + string ttt = node->getPath(); + if ( ttt.empty() ) { + ttt = "/"; + } + ttt += "\n"; + io->writestring( ttt.c_str() ); + } else if ( command == "get" || command == "show" ) { + if ( tokens.size() <= 1 ) { + // do nothing + } else { + string tmp; + string value = node->getStringValue ( tokens[1].c_str(), "" ); + if ( mode == PROMPT ) { + tmp = tokens[1] + " = '" + value + "' ("; + tmp += getValueTypeString( node->getNode( tokens[1].c_str() ) ); + tmp += ")\n"; + } else { + tmp = value + "\n"; + } + io->writestring( tmp.c_str() ); + } + } else if ( command == "set" ) { + if ( tokens.size() <= 2 ) { + // do nothing + } else { + string tmp = tokens[2]; + for ( unsigned int i = 3; i < tokens.size() - 1; i++ ) { + tmp += " " + tokens[i]; + } + node->getNode( tokens[1].c_str(), true )->setStringValue(tmp.c_str()); + + if ( mode == PROMPT ) { + // now fetch and write out the new value as confirmation + // of the change + string value = node->getStringValue ( tokens[1].c_str(), "" ); + string tmp = tokens[1] + " = '" + value + "' ("; + tmp += getValueTypeString( node->getNode( tokens[1].c_str() ) ); + tmp += ")\n"; + + io->writestring( tmp.c_str() ); + } + } + } else if ( command == "quit" ) { + close(); + reset(); + return true; + } else if ( command == "data" ) { + mode = DATA; + } else if ( command == "prompt" ) { + mode = PROMPT; + } else { + io->writestring( "\n" ); + io->writestring( "Valid commands are:\n" ); + io->writestring( "\n" ); + io->writestring( "help show help message\n" ); + io->writestring( "ls [] list directory\n" ); + io->writestring( "dump dump current state (in xml)\n" ); + io->writestring( "cd cd to a directory, '..' to move back\n" ); + io->writestring( "pwd display your current path\n" ); + io->writestring( "get show the value of a parameter\n" ); + io->writestring( "show synonym for get\n" ); + io->writestring( "set set to a new \n" ); + io->writestring( "data switch to raw data mode\n" ); + io->writestring( "prompt switch to interactive mode (default)\n" ); + io->writestring( "quit terminate connection\n" ); + io->writestring( "\n" ); } + if ( mode == PROMPT ) { + string prompt = node->getPath(); + if ( prompt.empty() ) { + prompt = "/"; + } + prompt += "> "; + io->writestring( prompt.c_str() ); + } return true; } @@ -85,17 +285,18 @@ bool FGProps::process_command( const char *cmd ) { // process work for this port bool FGProps::process() { SGIOChannel *io = get_io_channel(); + char buf[max_cmd_len]; - cout << "processing incoming props command" << endl; + // cout << "processing incoming props command" << endl; if ( get_direction() == SG_IO_BI ) { - cout << " (bi directional)" << endl; - while ( io->read( buf, max_cmd_len ) > 0 ) { - FG_LOG( FG_IO, FG_ALERT, "Success reading data." ); + // cout << " (bi directional)" << endl; + while ( io->readline( buf, max_cmd_len ) > 0 ) { + SG_LOG( SG_IO, SG_ALERT, "Success reading data." ); process_command( buf ); } } else { - FG_LOG( FG_IO, FG_ALERT, + SG_LOG( SG_IO, SG_ALERT, "in or out direction not supported for FGProps." ); } @@ -107,11 +308,11 @@ bool FGProps::process() { bool FGProps::close() { SGIOChannel *io = get_io_channel(); - set_enabled( false ); - if ( ! io->close() ) { return false; } + cout << "successfully closed channel\n"; + return true; }