- char *authors_copy;
- char *current_author;
- char *last_pipe,*next_pipe;
- int idx,nm_start,author_len,authors_len;
-
- if (thread->authors == NULL || author == NULL)
- return;
- if (thread->nonmatched_authors == NULL)
- thread->nonmatched_authors = thread->authors;
- author_len = strlen(author);
- authors_len = strlen(thread->authors);
- if (author_len == authors_len) {
- /* just one author */
- thread->nonmatched_authors += author_len;
- return;
- }
- current_author = strcasestr(thread->authors, author);
- if (current_author == NULL)
- return;
- /* how far inside the nonmatched authors is our author? */
- idx = current_author - thread->nonmatched_authors;
- if (idx < 0) {
- /* already among matched authors */
- return;
- }
- /* are there any authors in the list after our author? */
- if (thread->nonmatched_authors + author_len < thread->authors + authors_len) {
- /* we have to make changes, so let's get a temp copy */
- authors_copy = talloc_strdup(thread,thread->authors);
- /* nm_start is the offset into where the non-matched authors start */
- nm_start = thread->nonmatched_authors - thread->authors;
- /* copy this author and add the "| " - the if clause above tells us there's more */
- strncpy(thread->nonmatched_authors,author,author_len);
- strncpy(thread->nonmatched_authors+author_len,"| ",2);
- thread->nonmatched_authors += author_len+2;
- if (idx > 0) {
- /* we are actually moving authors around, not just changing the separator
- * first copy the authors that came BEFORE our author */
- strncpy(thread->nonmatched_authors, authors_copy+nm_start, idx-2);
- /* finally, if there are authors AFTER our author, copy those */
- if(author_len+nm_start+idx < authors_len) {
- strncpy(thread->nonmatched_authors + idx - 2,", ",2);
- strncpy(thread->nonmatched_authors + idx, authors_copy+nm_start + idx + author_len + 2,
- authors_len - (nm_start + idx + author_len + 2));
- }
- }
- /* finally let's make sure there's just one '|' in the authors string */
- last_pipe = strchr(thread->authors,'|');
- while (last_pipe) {
- next_pipe = strchr(last_pipe+1,'|');
- if (next_pipe)
- *last_pipe = ',';
- last_pipe = next_pipe;
+ unsigned int i;
+ char *author;
+
+ for (i = 0; i < thread->authors_array->len; i++) {
+ author = (char *) g_ptr_array_index (thread->authors_array, i);
+ if (g_hash_table_lookup_extended (thread->matched_authors_hash,
+ author, NULL, NULL))
+ continue;
+ if (thread->has_non_matched_authors) {
+ thread->authors = talloc_asprintf (thread, "%s, %s",
+ thread->authors,
+ author);
+ } else {
+ thread->authors = talloc_asprintf (thread, "%s| %s",
+ thread->authors,
+ author);
+ thread->has_non_matched_authors = 1;