Changeset 740:940403ee48fb for src

Timestamp:

01/02/16 12:16:46 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for an environment variable that can be set to use a different base URL for the MAVA site.

Location:

src/mlx

Files:

• common.py (modified) (1 diff)
• gui/acars.py (modified) (1 diff)
• web.py (modified) (6 diffs)

src/mlx/common.py

@@ -15 +15 @@
 # used, which is the default on Windows or when the \c FORCE_PYGTK environment
 # variable is set.
+
+#---------------------------------------------------------------------------------------
+
+MAVA_BASE_URL = os.environ.get("MAVA_BASE_URL", "http://virtualairlines.hu")
 
 #-------------------------------------------------------------------------------

src/mlx/gui/acars.py

@@ -21 +21 @@
     """The flight info tab."""
     # The URL of the ACARS map
-    URL = "http://virtualairlines.hu/acars2/show.html"
+    URL = MAVA_BASE_URL + "/acars2/show.html"
 
     def __init__(self, gui):

src/mlx/web.py

@@ -2 +2 @@
 import const
 import util
+
+from common import MAVA_BASE_URL
 
 import threading
@@ -687 +689 @@
 
         if self._entranceExam:
-            url = "http://www.virtualairlines.hu/ellenorzo/getflightplan.php?pid=%s" % \
+            url = MAVA_BASE_URL + "/ellenorzo/getflightplan.php?pid=%s" % \
                   (pilotID,)
         else:
-            url = "http://www.virtualairlines.hu/leker2.php?pid=%s&psw=%s" % \
+            url = MAVA_BASE_URL + "/leker2.php?pid=%s&psw=%s" % \
                   (pilotID, password)
 
@@ -745 +747 @@
     def run(self):
         """Perform the login request."""
-        url = "http://www.virtualairlines.hu/onlinegates_get.php"
+        url = MAVA_BASE_URL + "/onlinegates_get.php"
 
         f = urllib2.urlopen(url, timeout = 10.0)
@@ -767 +769 @@
     def run(self):
         """Perform the plane update."""
-        url = "http://www.virtualairlines.hu/onlinegates_set.php"
+        url = MAVA_BASE_URL + "/onlinegates_set.php"
 
         status = "H" if self._status==const.PLANE_HOME else \
@@ -912 +914 @@
     def run(self):
         """Perform the sending of the PIREP."""
-        url = "http://www.virtualairlines.hu/malevacars.php"
-        #url = "http://localhost:15000"
+        url = MAVA_BASE_URL + "/malevacars.php"
 
         pirep = self._pirep
@@ -993 +994 @@
         print "Sending the online ACARS"
 
-        url = "http://www.virtualairlines.hu/acars2/acarsonline.php"
+        url = MAVA_BASE_URL  + "/acars2/acarsonline.php"
 
         acars = self._acars