Overview
| Comment: | поправил сообщения о ошибках импорта |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | master | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
13f90978c27b2269188c6da238c99ffd |
| User & Date: | c.kworr@d4daf22a-8aaf-11de-a64d-234b64dd91b4 on 2010-08-13 14:50:36.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2010-08-13
| ||
| 14:52 | smallint seems not enough when dealing with big site lists check-in: 5f6dc4c42d user: c.kworr@d4daf22a-8aaf-11de-a64d-234b64dd91b4 tags: master, trunk | |
| 14:50 | поправил сообщения о ошибках импорта check-in: 13f90978c2 user: c.kworr@d4daf22a-8aaf-11de-a64d-234b64dd91b4 tags: master, trunk | |
| 10:05 | added configuration dump/restore check-in: d301d9adc6 user: c.kworr@d4daf22a-8aaf-11de-a64d-234b64dd91b4 tags: master, trunk | |
Changes
Modified squid-tagger.py
from [f5c6157d84]
to [c46e709b29].
| ︙ | ︙ | |||
353 354 355 356 357 358 359 | elif config.options.load or config.options.load_conf: csv_reader = csv.reader(sys.stdin) first_row = next(csv_reader) if config.options.load: # loading database | | | | 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 |
elif config.options.load or config.options.load_conf:
csv_reader = csv.reader(sys.stdin)
first_row = next(csv_reader)
if config.options.load:
# loading database
assert first_row == data_fields, 'File must contain csv data with theese columns: ' + repr(data_fields)
tagdb.load(csv_reader)
elif config.options.load_conf:
# loading database
assert first_row == conf_fields, 'File must contain csv data with theese columns: ' + repr(conf_fields)
tagdb.load_conf(csv_reader)
else:
# main loop
config.section('reactor')
if config['reactor'] == 'thread':
|
| ︙ | ︙ |