Changeset 305:ddc2dfec2080 for src

Timestamp:

08/18/12 09:43:47 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The aircraft type name of booked flights is handled and is sent in the ACARS

File:

• src/mlx/web.py (modified) (6 diffs)

src/mlx/web.py

@@ -156 +156 @@
                     elif key=="planecode": self.aircraftType = \
                          self._decodeAircraftType(value)
+                    elif key=="planetype": self.aircraftTypeName = value
                     elif key=="tail_nr": self.tailNumber = value
                     elif key=="passenger": self.numPassengers = int(value)
@@ -167 +168 @@
                     elif key=="foglalas_id":
                         self.id = None if value=="0" else value
-                    elif key=="planetype": pass
                     else: lineOK = False
 
@@ -192 +192 @@
             if attribute not in d:
                 raise Exception("Attribute %s could not be read" % (attribute,))
+
+        if "aircraftTypeName" not in d:
+            self.aircraftTypeName = \
+                BookedFlight.TYPE2TYPECODE[self.aircraftType]
             
     def writeIntoFile(self, f):
@@ -202 +206 @@
         print >> f, "planecode=%s" % \
               (BookedFlight.TYPE2TYPECODE[self.aircraftType],)
+        print >> f, "planetype=%s" % (self.aircraftTypeName,)
         print >> f, "tail_nr=%s" % (self.tailNumber,)
         print >> f, "passenger=%d" % (self.numPassengers,)
@@ -222 +227 @@
         typeCode = line[:3]
         self.aircraftType = self._decodeAircraftType(typeCode)
+        self.aircraftTypeName = line[3:]
 
     def _decodeAircraftType(self, typeCode):
@@ -845 +851 @@
         data["pass"] = str(bookedFlight.numPassengers)
         data["callsign"] = bookedFlight.callsign
-        data["airplane"] = BookedFlight.TYPE2TYPECODE[bookedFlight.aircraftType]
+        data["airplane"] = bookedFlight.aircraftTypeName
         data["from"] = bookedFlight.departureICAO
         data["to"] = bookedFlight.arrivalICAO