just commit current status

5 files changed, 3 insertions, 11 deletions

diff --git a/NodeRRD.py b/NodeRRD.py
index f53cad6..6fa32f3 100644
--- a/NodeRRD.py
+++ b/NodeRRD.py
@@ -30,7 +30,7 @@ class NodeRRD(RRD):
         return os.path.basename(self.filename).rsplit('.', 2)[0] + ".png"
 
     def update(self):
-        super().update({'upstate': 1, 'clients': self.node.clients})
+        super().update({'upstate': 1, 'clients': self.node.clientcount})
 
     def graph(self, directory, timeframe):
         """
diff --git a/bat2nodes.py b/bat2nodes.py
index 7119464..6047d95 100755
--- a/bat2nodes.py
+++ b/bat2nodes.py
@@ -64,14 +64,6 @@ if options['alfred']:
   af = alfred()
   db.import_aliases(af.aliases())
 
-if options['alfred']:
-  af = alfred()
-  db.import_aliases(af.aliases())
-
-if options['alfred']:
-  af = alfred()
-  db.import_aliases(af.aliases())
-
 db.count_clients()
 
 if options['obscure']:
diff --git a/get-nodes.pl b/get-nodes.pl
index 5f6dc39..0e8f2ed 100755
--- a/get-nodes.pl
+++ b/get-nodes.pl
@@ -47,7 +47,7 @@ sub handle_node {
 	$tmp = $tmp->{'*'};
 	debug(4, "tmp:", $tmp);
 
-	next unless $tmp =~ m!{{Node\s*(\|.+?)}}!sm;
+	return unless $tmp =~ m!{{Node\s*(\|.+?)}}!sm;
 	$tmp = $1;
 
 	debug(5, "tmp:", $tmp);
diff --git a/mkmap.sh b/mkmap.sh
index e503a5e..22e0019 100755
--- a/mkmap.sh
+++ b/mkmap.sh
@@ -9,4 +9,4 @@ cd "$(dirname "$0")"/
 #./ffhlwiki.py http://freifunk.metameute.de/wiki/Knoten > aliases_hl.json
 #./ffhlwiki.py http://freifunk.metameute.de/wiki/Moelln:Knoten > aliases_moelln.json
 
-./bat2nodes.py -A -a aliases.json -a aliases_hl.json -a aliases_moelln.json -d $DEST
+./bat2nodes.py -A -a aliases.json -d $DEST
diff --git a/rrd.py b/rrd.py
index 5c3330d..5c3330d 100755..100644
--- a/rrd.py
+++ b/rrd.py