diff master/bin/finalMerge.py @ 38:beae6309d4ec

final merge
author Henry S. Thompson <ht@markup.co.uk>
date Thu, 29 Nov 2018 13:52:07 +0000
parents 9d4f130073b8
children
line wrap: on
line diff
--- a/master/bin/finalMerge.py	Thu Nov 29 13:51:43 2018 +0000
+++ b/master/bin/finalMerge.py	Thu Nov 29 13:52:07 2018 +0000
@@ -2,14 +2,19 @@
 import sys,re
 mh={}
 ms={}
+mm={}
+for (i,m) in enumerate(['0','Jan','Feb','Mar','Apr','May','Jun',
+        'Jul','Aug','Sep','Oct','Nov','Dec']):
+  mm[m]=i
 for l in sys.stdin:
   (h,m,y,c)=l.split()
   if h=='http':
     tab=mh
   else:
     tab=ms
+  m=mm[m]
   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')
+  for (k,v) in tab.items():
+    print(l,k,v,sep='\t')