Revert to pre-wind-sticking ground reaction forces until they can be debugged.

[flightgear.git] / src / Network / props.cxx

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 77fac588bb47c9f190302b4b89a8cbce70523534..7452f7b5daa1d7b904a7b041f2e298dda54896c8 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -31,12 +31,14 @@
 
 #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() {
 }
@@ -50,7 +52,7 @@ bool FGProps::open() {
     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;
     }
@@ -58,36 +60,41 @@ 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;
 }
 
 
 // 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::NONE ) {
+        result = "none";
+    } 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";
     }
 
@@ -124,11 +131,27 @@ bool FGProps::process_command( const char *cmd ) {
            } else {
                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() );
@@ -136,8 +159,14 @@ bool FGProps::process_command( const char *cmd ) {
         if ( tokens.size() <= 1 ) {
            // do nothing
        } else {
-           node = node->getNode(tokens[1]);
-           path = node->getPath();
+           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();
@@ -146,7 +175,7 @@ bool FGProps::process_command( const char *cmd ) {
        }
        ttt += "\n";
        io->writestring( ttt.c_str() );
-    } else if ( command == "show" ) {
+    } else if ( command == "get" || command == "show" ) {
        if ( tokens.size() <= 1 ) {
            // do nothing
        } else {
@@ -155,7 +184,7 @@ bool FGProps::process_command( const char *cmd ) {
 
            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() );
@@ -164,13 +193,13 @@ bool FGProps::process_command( const char *cmd ) {
         if ( tokens.size() <= 2 ) {
            // do nothing
        } else {
-           node->getValue( tokens[1], true )->setStringValue(tokens[2]);
+           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->getValue( tokens[1] ) );
+           tmp += getValueTypeString( node->getNode( tokens[1] ) );
            tmp += ")\n";
  
            io->writestring( tmp.c_str() );
@@ -183,9 +212,11 @@ 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 <dir>         cd to a directory, '..' to move back\n" );
        io->writestring( "pwd              display your current path\n" );
-       io->writestring( "show <var>       show the value of a parameter\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" );
@@ -211,11 +242,11 @@ bool FGProps::process() {
     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." );
     }