// $Id$
+#include <Main/globals.hxx>
+
#include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/io/iochannel.hxx>
#include <stdlib.h> // atoi() atof()
-#include <strstream>
+#include STL_STRSTREAM
#include "props.hxx"
-FG_USING_STD(cout);
-FG_USING_STD(istrstream);
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(istrstream);
+#endif
FGProps::FGProps() {
}
path = "/";
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;
}
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;
}
// return a human readable form of the value "type"
-static string getValueTypeString( const SGValue *v ) {
+static string getValueTypeString( const SGPropertyNode *node ) {
string result;
- if ( v == NULL ) {
+ if ( node == NULL ) {
return "unknown";
}
- SGValue::Type type = v->getType();
- if ( type == SGValue::UNKNOWN ) {
- result = "unknown";
- } else if ( type == SGValue::BOOL ) {
+ SGPropertyNode::Type type = node->getType();
+ if ( type == SGPropertyNode::UNSPECIFIED ) {
+ result = "unspecified";
+ } else if ( type == SGPropertyNode::BOOL ) {
result = "bool";
- } else if ( type == SGValue::INT ) {
+ } else if ( type == SGPropertyNode::INT ) {
result = "int";
- } else if ( type == SGValue::FLOAT ) {
+ } else if ( type == SGPropertyNode::LONG ) {
+ result = "long";
+ } else if ( type == SGPropertyNode::FLOAT ) {
result = "float";
- } else if ( type == SGValue::DOUBLE ) {
+ } else if ( type == SGPropertyNode::DOUBLE ) {
result = "double";
- } else if ( type == SGValue::STRING ) {
+ } else if ( type == SGPropertyNode::STRING ) {
result = "string";
}
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->getNode( 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->getNode( 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->getNode( 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->getNode( tokens[1] ) );
+ tmp += ")\n";
+
+ io->writestring( tmp.c_str() );
}
} else if ( command == "quit" ) {
close();
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 <dir> cd to a directory, '..' to move back\n" );
- io->writestring( "show <var> show the value of a parameter\n" );
+ io->writestring( "pwd display your current path\n" );
+ io->writestring( "get <var> show the value of a parameter\n" );
+ io->writestring( "show <var> synonym for get\n" );
io->writestring( "set <var> <val> set <var> to a new <val>\n" );
io->writestring( "quit terminate connection\n" );
io->writestring( "\n" );
}
- string prompt = node.getPath();
+ string prompt = node->getPath();
if ( prompt == "" ) {
prompt = "/";
}
if ( get_direction() == SG_IO_BI ) {
// cout << " (bi directional)" << endl;
while ( io->readline( buf, max_cmd_len ) > 0 ) {
- FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
+ 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." );
}
projects / flightgear.git / blobdiff