diff --git a/bin/Decoder.py b/bin/Decoder.py index 399cd4a8..af385fed 100755 --- a/bin/Decoder.py +++ b/bin/Decoder.py @@ -102,12 +102,19 @@ def save_hash(decoder_name, message, date, decoded): # create hash metadata serv_metadata.sadd('hash_'+ decoder_name +'_all_type', type) + # first time we see this hash today + if serv_metadata.zscore('hash_date:'+date_key, hash) is None: + serv_metadata.zincrby('hash_type:'+type, date_key, 1) + + # first time we see this hash encoding today + if serv_metadata.zscore(decoder_name+'_date:'+date_key, hash) is None: + serv_metadata.zincrby(decoder_name+'_type:'+type, date_key, 1) + save_hash_on_disk(decoded, type, hash, json_data) print('found {} '.format(type)) serv_metadata.hincrby('metadata_hash:'+hash, decoder_name+'_decoder', 1) - serv_metadata.zincrby('hash_type:'+type, date_key, 1) serv_metadata.zincrby(decoder_name+'_type:'+type, date_key, 1) serv_metadata.zincrby('nb_seen_hash:'+hash, message, 1)# hash - paste map diff --git a/var/www/modules/hashDecoded/templates/showHash.html b/var/www/modules/hashDecoded/templates/showHash.html index 561b61fd..ae2ddb6f 100644 --- a/var/www/modules/hashDecoded/templates/showHash.html +++ b/var/www/modules/hashDecoded/templates/showHash.html @@ -191,8 +191,8 @@ Graph
-
+ @@ -251,9 +251,9 @@ @@ -301,7 +301,11 @@ var width = 400, var link; -var transform = d3.zoomIdentity; +var zoom = d3.zoom() + .scaleExtent([.2, 10]) + .on("zoom", zoomed); + +//var transform = d3.zoomIdentity; var color = d3.scaleOrdinal(d3.schemeCategory10); @@ -322,9 +326,9 @@ var svg_node = d3.select("#graph").append("svg") .call(d3.zoom().scaleExtent([1, 8]).on("zoom", zoomed)) .on("dblclick.zoom", null) -var container_graph = svg_node.append("g") - .attr("transform", "translate(40,0)") - .attr("transform", "scale(2)"); +var container_graph = svg_node.append("g"); + //.attr("transform", "translate(40,0)") + //.attr("transform", "scale(2)"); function create_graph(url){ @@ -372,6 +376,9 @@ d3.json(url) return d.icon } }); + zoom.translateTo(svg_node, 200, 200); + zoom.scaleTo(svg_node, 2); + /* node.append("text") .attr("dy", 3) .attr("dx", 7) @@ -403,7 +410,7 @@ d3.json(url) } function zoomed() { -container_graph.attr("transform", d3.event.transform); + container_graph.attr("transform", d3.event.transform); } function doubleclick (d) {