Changeset 9:953cd606427c in xplra for misc

Timestamp:

01/04/13 16:12:21 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Registering multi-data update requests works

Location:

misc

Files:

• client.py (modified) (3 diffs)
• test4.sh (added)

misc/client.py

@@ -100 +100 @@
         self._stream = stream
         self._multiGets = {}
+        self._multiSets = {}
 
         self.use_rawinput = True
@@ -230 +231 @@
 
     def do_exec_multiget(self, args):
-        """Handle the 'unreg_multiget' command"""
+        """Handle the 'exec_multiget' command"""
         words = self._splitArgs(args)
         if len(words)<1:
@@ -254 +255 @@
             print >> sys.stderr, "Invalid dataref at #%d" % (index,)
         else:
+            print >> sys.stderr, "Error code:", result
+
+    def do_reg_multiset(self, args):
+        """Handle the 'reg_multiset' command"""
+        words = self._splitArgs(args)
+        specs = []
+        while words:
+            result = self._parseGetSpec(words)
+            if result is None:
+                return False
+            else:
+                specs.append(result[0])
+                words = result[1]
+
+        if not specs:
+            return False
+
+        self._writeU8(0x21)
+        self._writeU32(len(specs))
+        for (name, type, length, offset) in specs:
+            print name, type
+            self._writeString(name)
+            self._writeU8(self._types[type])
+            if length is not None:
+                self._writeS32(length)
+                self._writeS32(offset)
+        self._flush()
+
+        result = self._readU8()
+        if result==0:
+            id = self._readU32()
+            self._multiSets[id] = \
+                [(type, length) for (name, type, length, offset) in specs]
+            print "ID:", id
+        else:
+            print >> sys.stderr, "Error code:", result
+
+    def do_unreg_multiset(self, args):
+        """Handle the 'unreg_multiset' command"""
+        words = self._splitArgs(args)
+        if len(words)<1:
+            print >> sys.stderr, "Missing parameter"
+            return False
+
+        id = int(words[0])
+
+        self._writeU8(0x22)
+        self._writeU32(id)
+        self._flush()
+
+        result = self._readU8()
+        if result!=0:
+            print >> sys.stderr, "Error code:", result
+
+        if id in self._multiSets:
+            del self._multiSets[id]
+
+    def do_exec_multiset(self, args):
+        """Handle the 'exec_multiget' command"""
+        words = self._splitArgs(args)
+        if len(words)<1:
+            print >> sys.stderr, "Missing parameter"
+            return False
+
+        id = int(words[0])
+        if id not in self._multiSets:
+            print >> sys.stderr, "Invalid ID"
+            return False
+
+        words = words[1:]
+        types = self._multiSets[id]
+        if len(words)<len(types):
+            print >> sys.stderr, "Missing parameter"
+            return False
+
+
+        self._writeU8(0x23)
+        self._writeU32(id)
+        for ((type, length), word) in zip(types, words):
+            self._writeValue(type, word, length)
+        self._flush()
+
+        result = self._readU8()
+        if result==0x02:
+            index = self._readU32()
+            print >> sys.stderr, "Invalid dataref at #%d" % (index,)
+        elif result!=0:
             print >> sys.stderr, "Error code:", result