X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fprops.cxx;h=1a42c8d62f536f03c7ea64b815c92222efa53f20;hb=17c96ae69ed7a3c33c816e821ae88c501ab7cf65;hp=29730db427b48f458f444a511a5b34fb68d6925d;hpb=63bbe7de75780857d2d8896dd6af72e380fd97ab;p=flightgear.git diff --git a/src/Network/props.cxx b/src/Network/props.cxx index 29730db42..1a42c8d62 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -21,6 +21,8 @@ // $Id$ +#include
+ #include #include #include @@ -33,8 +35,8 @@ #include "props.hxx" -FG_USING_STD(cout); -FG_USING_STD(istrstream); +SG_USING_STD(cout); +SG_USING_STD(istrstream); FGProps::FGProps() { } @@ -61,6 +63,7 @@ bool FGProps::open() { } set_enabled( true ); + FG_LOG( FG_IO, FG_INFO, "Opening properties channel communication layer." ); return true; } @@ -110,105 +113,90 @@ bool FGProps::process_command( const char *cmd ) { string command = tokens[0]; - SGPropertyNode node( path, ¤t_properties ); - if ( node.getPath() == "" ) { - node.setPath( "/" ); - } + SGPropertyNode * node = globals->get_props()->getNode(path); if ( command == "ls" ) { - for (int i = 0; i < (int)node.size(); i++) { - SGPropertyNode child = node.getChild(i); - string name = child.getName(); + for (int i = 0; i < (int)node->nChildren(); i++) { + SGPropertyNode * child = node->getChild(i); + string name = child->getName(); string line = name; - if ( child.size() > 0 ) { + if ( child->nChildren() > 0 ) { line += "/\n"; } else { - string value = node.getStringValue ( name, "" ); + string value = node->getStringValue ( name, "" ); line += " =\t'" + value + "'\t("; - line += getValueTypeString( node.getValue( name ) ); + line += getValueTypeString( node->getValue( name ) ); 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]); + if ( child ) { + writeProperties ( buf, child ); + io->writestring( buf.str() ); + } else { + 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 ) { + if ( tokens.size() <= 1 ) { // do nothing - } else if ( tokens[1] == "." ) { - // do nothing - } else if ( tokens[1] == ".." ) { - // go back one level - string current = node.getPath(); - int pos = current.rfind("/"); - // cout << "path = " << current << endl; - // cout << "new path = " << current.substr(0, pos) << endl;d - string tmp = current.substr(0, pos); - node.setPath( tmp ); - path = tmp; } else { - // decend to specified child - string tmp = node.getPath(); - tmp += "/" + tokens[1]; - node.setPath( tmp ); - path = tmp; + SGPropertyNode *child = node->getNode(tokens[1]); + if ( child ) { + node = child; + path = node->getPath(); + } else { + tokens[1] += " Not Found\n"; + io->writestring( tokens[1].c_str() ); + } + } + } else if ( command == "pwd" ) { + string ttt = node->getPath(); + if ( ttt == "" ) { + ttt = "/"; } - } else if ( command == "show" ) { + ttt += "\n"; + io->writestring( ttt.c_str() ); + } else if ( command == "get" || command == "show" ) { if ( tokens.size() <= 1 ) { // do nothing } else { string ttt = "debug = '" + tokens[1] + "'\n"; io->writestring( ttt.c_str() ); - string value = node.getStringValue ( tokens[1], "" ); + string value = node->getStringValue ( tokens[1], "" ); string tmp = tokens[1] + " = '" + value + "' ("; - tmp += getValueTypeString( node.getValue( tokens[1] ) ); + tmp += getValueTypeString( node->getValue( tokens[1] ) ); tmp += ")\n"; io->writestring( tmp.c_str() ); } } else if ( command == "set" ) { - if ( tokens.size() <= 2 ) { + if ( tokens.size() <= 2 ) { // do nothing } else { - SGValue *v = node.getValue( tokens[1] ); - if ( v != NULL ) { - SGValue::Type type = v->getType(); - if ( type == SGValue::UNKNOWN ) { - v->setUnknownValue( tokens[2] ); - } else if ( type == SGValue::BOOL ) { - if ( tokens[2] == "true" ) { - v->setBoolValue( true ); - } else if ( tokens[2] == "false" ) { - v->setBoolValue( false ); - } else { - v->setBoolValue( atoi( tokens[2].c_str() ) ); - } - } else if ( type == SGValue::INT ) { - v->setIntValue( atoi( tokens[2].c_str() ) ); - } else if ( type == SGValue::FLOAT ) { - v->setFloatValue( atof( tokens[2].c_str() ) ); - } else if ( type == SGValue::DOUBLE ) { - v->setDoubleValue( atof( tokens[2].c_str() ) ); - } else if ( type == SGValue::STRING ) { - v->setStringValue( tokens[2] ); - } - - // now fetch and write out the new value as confirmation - // of the change - string value = node.getStringValue ( tokens[1], "" ); - string tmp = tokens[1] + " = '" + value + "' ("; - tmp += getValueTypeString( node.getValue( tokens[1] ) ); - tmp += ")\n"; - - io->writestring( tmp.c_str() ); - } else { - string tmp = tokens[1] + " is unknown.\n"; - - io->writestring( tmp.c_str() ); - } + node->getValue( tokens[1], true )->setStringValue(tokens[2]); + // now fetch and write out the new value as confirmation + // of the change + string value = node->getStringValue ( tokens[1], "" ); + string tmp = tokens[1] + " = '" + value + "' ("; + tmp += getValueTypeString( node->getValue( tokens[1] ) ); + tmp += ")\n"; + + io->writestring( tmp.c_str() ); } } else if ( command == "quit" ) { close(); @@ -218,14 +206,17 @@ bool FGProps::process_command( const char *cmd ) { io->writestring( "\n" ); io->writestring( "help show help message\n" ); io->writestring( "ls list current directory\n" ); + io->writestring( "dump dump current state (in xml)\n" ); io->writestring( "cd cd to a directory, '..' to move back\n" ); - io->writestring( "show show the value of a parameter\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( "quit terminate connection\n" ); io->writestring( "\n" ); } - string prompt = node.getPath(); + string prompt = node->getPath(); if ( prompt == "" ) { prompt = "/"; }