# HG changeset patch # User Henry S. Thompson # Date 1543498887 0 # Node ID 9d4f130073b8d52e909e324045f87ba9dcac5baf # Parent 1b6bcc54268ddce2decc15a5b37b3a45b50f92e9 merge the uploaded results of fixAndMerge diff -r 1b6bcc54268d -r 9d4f130073b8 master/bin/finalMerge.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/master/bin/finalMerge.py Thu Nov 29 13:41:27 2018 +0000 @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 +import sys,re +mh={} +ms={} +for l in sys.stdin: + (h,m,y,c)=l.split() + if h=='http': + tab=mh + else: + tab=ms + key='%s\t%s'%(m,y) + tab[key]=tab.get(key,0)+int(c) +for (l,tab) in zip(['http','https'],[mh,ms]): + for k in sorted(tab.keys()): + print(l,k,tab[k],sep='\t')