fix positon of port number when generating interface url
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Tue, 19 Oct 2010 17:46:45 +0000 (13:46 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Tue, 19 Oct 2010 17:46:45 +0000 (13:46 -0400)
sfa/server/interface.py

index 0804fc1..e923057 100644 (file)
@@ -60,8 +60,12 @@ class Interfaces(dict):
             interfaces = [self.interfaces]
         # set the url and urn 
         for interface in interfaces:
+            # port is appended onto the domain, before the path. Should look like:
+            # http://domain:port/path
             hrn, address, port = interface['hrn'], interface['addr'], interface['port']
-            url = 'http://%(address)s:%(port)s' % locals()
+            address_parts = address.split('/')
+            address_parts[0] = address_parts[0] + ":" + str(port)
+            url =  "http://%s" %  "/".join(address_parts)
             interface['url'] = url
             interface['urn'] = hrn_to_urn(hrn, 'authority')