freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

try non-fuzzy prior fuzzy mac matching

Browse source 
Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
This commit is contained in:
Linus Lüssing 2014-05-02 04:08:23 +02:00
parent ac3366ff13
commit 605765cd12
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nodedb.py
View file

@ -169,12 +169,15 @@ class NodeDB:
def import_aliases(self, aliases): def import_aliases(self, aliases):
for mac, alias in aliases.items(): for mac, alias in aliases.items():
try: try:
node = self.maybe_node_by_fuzzy_mac(mac) node = self.maybe_node_by_mac([mac])
except: except:
# create an offline node try:
node = Node() node = self.maybe_node_by_fuzzy_mac(mac)
node.add_mac(mac) except:
self._nodes.append(node) # create an offline node
node = Node()
node.add_mac(mac)
self._nodes.append(node)
if 'name' in alias: if 'name' in alias:
node.name = alias['name'] node.name = alias['name']