Fix merge remanences

This commit is contained in:
Théophile Bastian 2018-02-26 15:37:05 +01:00
parent 98fe69ba62
commit e140d4a8a7
2 changed files with 2 additions and 13 deletions

View file

@ -171,16 +171,6 @@ def generate_partial_history(user, t_start):
basis = generate_first_url(user)
result.append(PartialHistoryEntry(basis, timestamp))
t_start += 5 * random.weibullvariate(1, 1.5)
<<<<<<< HEAD
output_tree = []
crawler = crawl.CrawlingThread(basis, output_tree)
crawler.start()
crawler.join()
urls = crawler.output_tree
for url in urls:
t_start += 5 * random.weibullvariate(1, 1.5)
result.append(PartialHistoryEntry(url.url, timestamp))
=======
crawler = crawl.CrawlingThread(basis)
crawler.start()
crawler.join()
@ -196,7 +186,6 @@ def generate_partial_history(user, t_start):
timestamp = open_time[parent] + 5 * random.weibullvariate(1, 1.5)
open_time[elem] = timestamp
result.append(PartialHistoryEntry(url, timestamp))
>>>>>>> Real async crawling
return result
@ -257,7 +246,7 @@ def generate_history(user, start_time):
if len(url) < 200:
new_line = HistoryEntry(
search=url,
timestamp=datetime.fromtimestamp(timestamp), # FIXME tz
timestamp=datetime.fromtimestamp(timestamp),
history=history
)
try:

View file

@ -97,7 +97,7 @@ USE_I18N = True
USE_L10N = True
USE_TZ = True
USE_TZ = False # We don't really care, we want POSIX timestamps
# Static files (CSS, JavaScript, Images)