Changeset 6:8dd4ca9966d0 in xplra for src/xplra/ServerThread.cc

Timestamp:

01/03/13 19:09:46 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Made all the single query operation work for all types

File:

• src/xplra/ServerThread.cc (modified) (2 diffs)

src/xplra/ServerThread.cc

@@ -110 +110 @@
         //             this, command);
 
-        if (command==Protocol::CMD_GET_SINGLE) {
-            string name = stream.readString();
-            uint8_t type = stream.readU8();
-            if (!stream) continue;
-            // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: name='%s', type=0x%02x\n",
-            //             this, name.c_str(), type);
-            if (type==Protocol::TYPE_BYTE_ARRAY) {
-                int length = stream.readS32();
-                if (!stream) continue;
-
-                // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: length=%lu\n",
-                //             this, static_cast<unsigned long>(length));
-
-                GetByteArrayDataRefTask* task =
-                    new GetByteArrayDataRefTask(name, length);
-                TaskRequest request(task);
-
-                if (requestQueue.execute(&request)) {
-                    // Util::debug("hu.varadiistvan.xplra.ServerThread[%p]::run: request executed\n");
-                    stream.writeU8(Protocol::RESULT_OK);
-                    int length = task->getLength();
-                    stream.writeS32(length);
-                    if (length>0) {
-                        stream.write(task->getData(), length);
-                    }
-                } else {
-                    break;
-                }
-            } else {
-                stream.writeU8(Protocol::RESULT_OTHER_ERROR);
-            }
+        if (command==Protocol::COMMAND_GET_SINGLE) {
+            if (!handleGetSingle(stream)) break;
         } else {
             stream.writeU8(Protocol::RESULT_INVALID_COMMAND);
@@ -152 +123 @@
 //------------------------------------------------------------------------------
 
+bool ServerThread::handleGetSingle(xplcommon::DataStream& stream)
+{
+    uint8_t result = Protocol::RESULT_OK;
+
+    GetDataRefTask* task = GetDataRefTask::create(result, stream);
+
+    if (!stream) return false;
+    else if (task==0) {
+        stream.writeU8(Protocol::RESULT_INVALID_TYPE);
+        return true;
+    }
+
+    TaskRequest request(task);
+    if (!requestQueue.execute(&request)) return false;
+
+    if (task->isValid()) {
+        stream.writeU8(Protocol::RESULT_OK);
+        task->writeValue(stream);
+    } else {
+        stream.writeU8(Protocol::RESULT_UNKNOWN_DATAREF);
+    }
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++