Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Speed up ICU key generation by not preflighting in most cases

Browse Source
This commit is contained in:
Kovid Goyal 2010-12-04 09:45:45 -07:00
parent 0aab245a1d
commit 97bd4f161c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/utils/icu.c
View File

@ -108,11 +108,22 @@ icu_Collator_sort_key(icu_Collator *self, PyObject *args, PyObject *kwargs) {
PyMem_Free(input); PyMem_Free(input);
if (U_SUCCESS(status)) { if (U_SUCCESS(status)) {
key_size = ucol_getSortKey(self->collator, buf, -1, NULL, 0); buf2 = (uint8_t*)calloc(7*sz+1, sizeof(uint8_t));
buf2 = (uint8_t*)calloc(key_size + 1, sizeof(uint8_t));
if (buf2 == NULL) return PyErr_NoMemory(); if (buf2 == NULL) return PyErr_NoMemory();
ucol_getSortKey(self->collator, buf, -1, buf2, key_size+1);
ans = PyBytes_FromString((char *)buf2); key_size = ucol_getSortKey(self->collator, buf, -1, buf2, 7*sz+1);
if (key_size == 0) {
ans = PyBytes_FromString("");
} else {
if (key_size >= 7*sz+1) {
free(buf2);
buf2 = (uint8_t*)calloc(key_size+1, sizeof(uint8_t));
if (buf2 == NULL) return PyErr_NoMemory();
ucol_getSortKey(self->collator, buf, -1, buf2, key_size+1);
}
ans = PyBytes_FromString((char *)buf2);
}
free(buf2); free(buf2);
} else ans = PyBytes_FromString(""); } else ans = PyBytes_FromString("");