[Nepomuk] Review Request 112475: For real, do not index files multiple times!

[Commit Hook]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/112475/
-----------------------------------------------------------

(Updated Sept. 3, 2013, 6:29 p.m.)


Status
------

This change has been marked as submitted.


Review request for Nepomuk and Vishesh Handa.


Description
-------

FileIndexer: Check for nepomukindexer crashing.

It is not enough to check that the indexer returns 0.
We must also check that it did not crash, and, if it did,
return an error.

This patch also defines an error enum for FileIndexingJob.

BUG: 324307

FileIndexer: Really do not index file multiple times

In commit c441198286562924ad3980527913b4888bdcb7a6
I attempted to implement not re-indexing files which failed to index.

However, my code made no sense!

It attempted to set kext::indexingLevel to -1 if the nepomukindexer job
returned with an error. But, the KJob never set an error even if the
indexer returned 1, so nothing happened.

Even when this was fixed, it still didn't work, because I was updating
the indexingLevel of the current filename, not the resource URI of the
current filename.

So, to summarise, I was silly. This one works, and an easy way to test
it is to replace /usr/bin/nepomukindexer with:

 #!/bin/bash
 exit 1

Apologies for this - I clearly didn't test it properly last time.


This addresses bug 324307.
    http://bugs.kde.org/show_bug.cgi?id=324307


Diffs
-----

  services/fileindexer/fileindexingjob.h bd1fd9499f073fdc8393d0dedf1a9bf1cd3b54d6 
  services/fileindexer/fileindexingjob.cpp 5878e7b7e09ffe1b0d57fba676bd8e746854836a 
  services/fileindexer/fileindexingqueue.cpp 7a2d6cba4ed883602797a793f613ab0cda94374a 

Diff: http://git.reviewboard.kde.org/r/112475/diff/


Testing
-------

Tested with a file that does not index correctly, and another that crashed nepomukindexer


Thanks,

Simeon Bird

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/nepomuk/attachments/20130903/b60b5bb4/attachment.html>