@@ -173,22 +173,12 @@ def extract(first_week=None, last_week=None, test_mode=False):
173173 # update each state
174174 for state in states :
175175 try :
176- num1 = get_num_hits (cur , epiweek , state , pages [0 ])
177- num2 = get_num_hits (cur , epiweek , state , pages [1 ])
178- num3 = get_num_hits (cur , epiweek , state , pages [2 ])
179- num4 = get_num_hits (cur , epiweek , state , pages [3 ])
180- num5 = get_num_hits (cur , epiweek , state , pages [4 ])
181- num6 = get_num_hits (cur , epiweek , state , pages [5 ])
182- num7 = get_num_hits (cur , epiweek , state , pages [6 ])
183- num8 = get_num_hits (cur , epiweek , state , pages [7 ])
176+ nums = []
177+ for i in range (8 ):
178+ nums [i ] = get_num_hits (cur , epiweek , state , pages [i ])
184179 total = get_total_hits (cur , epiweek , state )
185- store_result (
186- cur , epiweek , state , num1 , num2 , num3 , num4 , num5 , num6 , num7 , num8 , total
187- )
188- print (
189- " %d-%s: %d %d %d %d %d %d %d %d (%d)"
190- % (epiweek , state , num1 , num2 , num3 , num4 , num5 , num6 , num7 , num8 , total )
191- )
180+ store_result (cur , epiweek , state , * nums , total )
181+ print (f" { epiweek } -{ state } : { ' ' .join (str (n ) for n in nums )} ({ total } )" )
192182 except Exception as ex :
193183 print (" %d-%s: failed" % (epiweek , state ), ex )
194184 # raise ex
0 commit comments