Merge lp:~george-edison55/askubuntu-lens/askubuntu-lens-local-search into lp:~stefano-palazzo/askubuntu-lens/trunk

[Nathan Osman]

I have added code to the askubuntu_bridge.py file that will cause the lens to first attempt to retrieve the data from the local server where possible and failing that to try the other servers as per usual.

=== modified file 'askubuntu_bridge.py'
--- askubuntu_bridge.py	2011-10-18 02:14:00 +0000
+++ askubuntu_bridge.py	2011-10-31 04:56:22 +0000
@@ -103,17 +103,26 @@
     print "api.%s/\33[1;31m%s\33[m" % (site, query)
     if query.startswith("similar?title") and site == "askubuntu.com":
         try:
-            if random.random() > 0.5:
-                result = json.loads(urllib2.urlopen(
-                    "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
-                    timeout=0.5).read())
-                print "\33[1mused ec2 service\33[m"
-            else:
-                result = json.loads(urllib2.urlopen(
-                    "http://audata.quickmediasolutions.com:8046/%s" % query.replace(" ", "%20"),
-                    timeout=0.5).read())
-                print "\33[1mused AU Data Server service\33[m"
-            return result
+            # Check to see if we can ping the local data server running on
+            # port 19115
+            try:
+                result = json.loads(urllib2.urlopen(
+                    "http://localhost:19115/%s" % query.replace(" ", "%20"),
+                    timeout=0.2).read())
+                print "\33[1mused local service\33[m"
+                return result
+            except Exception as e:
+                if random.random() > 0.5:
+                    result = json.loads(urllib2.urlopen(
+                        "http://50.19.108.78:8080/%s" % query.replace(" ", "%20"),
+                        timeout=0.5).read())
+                    print "\33[1mused ec2 service\33[m"
+                else:
+                    result = json.loads(urllib2.urlopen(
+                        "http://audata.quickmediasolutions.com:8046/%s" % query.replace(" ", "%20"),
+                        timeout=0.5).read())
+                    print "\33[1mused AU Data Server service\33[m"
+                return result
         except Exception as e:
             print "\33[1;31m%s\33[m" % repr(e)
     try: