Changeset 8302 in genesis for nodes

Timestamp:

Aug 10, 2010, 6:21:06 PM (14 years ago)

Author:

rick

Message:

Cache broke

File:

• nodes/make-map.py (modified) (2 diffs)

nodes/make-map.py

@@ -60 +60 @@
 def rd2etrs(xrd, yrd, hnap=0.0):
   """ Convert rd to etrs """
+  # Get cache is exists
   global coordinates
-  xrd = float(str(xrd))
-  yrd = float(str(yrd))
   if coordinates == None:
     try: 
       coordinates = get_yaml(CACHE_FILE)
-      if coordinates.has_key((xrd, yrd)):
-       return coordinates[(xrd, yrd)]
     except (IOError,AttributeError):
       coordinates = dict()
       pass
 
+  # Check if item in cache
+  xrd = float(str(xrd))
+  yrd = float(str(yrd))
+  if coordinates.has_key((xrd, yrd)):
+    return coordinates[(xrd, yrd)]
+
+  # Get new coordinate
   item = dict()
   item['xrd'] = xrd
@@ -79 +83 @@
   args = "&".join(["%s=%s" % (k,v) for k,v in item.iteritems()])
   url = 'http://www.rdnap.nl/cgi-bin/rdetrs.pl?%s' % args
-  print "### Fetching coordinate %s, %s from %s" % (xrd, yrd, url) 
+  print "### Not in Cache, Fetching coordinate %s, %s from %s" % (xrd, yrd, url) 
   f = urllib.urlopen(url)
   raw = f.read()