From: Tony Mack Date: Thu, 23 Jun 2011 23:34:41 +0000 (-0400) Subject: dont include the location tag if longitude or latitude is null X-Git-Tag: sfa-1.0-27~73 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a33356c8bea1f30560d61229e6583a44b78564a5;p=sfa.git dont include the location tag if longitude or latitude is null --- diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py index 0752974e..cc73047d 100755 --- a/sfa/rspecs/pg_rspec.py +++ b/sfa/rspecs/pg_rspec.py @@ -121,14 +121,15 @@ class PGRSpec(RSpec): node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='plab-pc') node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='pc') available_tag = etree.SubElement(node_tag, 'available', now='true') - location_tag = etree.SubElement(node_tag, 'location', country="us") + + # only add location tag if longitude and latitude are not null if 'site' in node: - if 'longitude' in node['site']: - location_tag.set('longitude', str(node['site']['longitude'])) - if 'latitude' in node['site']: - location_tag.set('latitude', str(node['site']['latitude'])) - #if 'interfaces' in node: - + longitude = node['site'].get('longitude', None) + latitude = node['site'].get('latitude', None) + if longitude and latitude: + location_tag = etree.SubElement(node_tag, 'location', country="us", \ + longitude=longitude, latitude=latitude) + def add_slivers(self, slivers, sliver_urn=None, no_dupes=False): slivers = self._process_slivers(slivers)