X-Git-Url: https://git.phdru.name/?p=m_librarian.git;a=blobdiff_plain;f=m_librarian%2Finp.py;h=f46bea62fe2a5270cb2075ec36fdb4ecd2f55df3;hp=4b772aff703f050d69117e2ef1725eb575d157c8;hb=35ed1dae004da9bc8b17c867735eb0b275d30d81;hpb=8f210fc84284ebd705b6c6a1bcf81b982dbdc21f diff --git a/m_librarian/inp.py b/m_librarian/inp.py index 4b772af..f46bea6 100644 --- a/m_librarian/inp.py +++ b/m_librarian/inp.py @@ -78,7 +78,7 @@ def import_inp(archive, inp): connection = sqlhub.processConnection for file, in connection.queryAll(connection.sqlrepr( Select(Book.q.file, Book.q.archive == archive))): - files.add((archive, file)) + files.add((archive, file.decode('utf-8'))) for line in inp: line = line.decode('utf-8') _archive, parts = split_line(line) @@ -86,7 +86,7 @@ def import_inp(archive, inp): archives.add(_archive) for file, in connection.queryAll(connection.sqlrepr( Select(Book.q.file, Book.q.archive == _archive))): - files.add((_archive, file)) + files.add((_archive, file.decode('utf-8'))) file = parts[5] if (_archive or archive, file) not in files: files.add((_archive or archive, file))