From 4df71c4a54f0ad9fd5877447280aedf1e0cc1445 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 2 Sep 2020 09:02:23 +0200 Subject: [PATCH] doc --- src/doc/user/usermanual.html | 32 ++++++++++++++++++++++++-------- src/doc/user/usermanual.xml | 29 ++++++++++++++++++++++++----- src/utils/smallut.cpp | 7 +++++-- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/doc/user/usermanual.html b/src/doc/user/usermanual.html index 29c8d24e..72060c70 100644 --- a/src/doc/user/usermanual.html +++ b/src/doc/user/usermanual.html @@ -94,9 +94,9 @@ alink="#0000FF">
2.1.3. Document types
2.1.4. Indexing failures
+ "#idm284">Indexing failures
2.1.5. Recovery
+ "#idm294">Recovery
2.2. recoll GUI. It is stored in the missing text file inside the configuration directory.

+

After installing a missing handler, you may need to + tell recollindex to retry + the failed files, by adding option -k to the command line, or by using the + GUI File → Special indexing menu. This is + because recollindex, in its + default operation mode, will not retry files which caused + an error during an earlier pass. In special cases, it may + be useful to reset the data for a category of files + before indexing. See the recollindex manual + page. If your index is not too big, it may be simpler to + just reset it.

By default, Recoll will try to index any file type that it has a way to read. This is sometimes not desirable, and there are ways @@ -1038,8 +1054,8 @@ alink="#0000FF">

-

2.1.4. Indexing failures

+

2.1.4. Indexing failures

@@ -1069,8 +1085,8 @@ alink="#0000FF">
-

2.1.5. Recovery

+

2.1.5. Recovery

@@ -1423,8 +1439,8 @@ alink="#0000FF">
-

In practise: creating and using an +

In practise: creating and using an additional index

diff --git a/src/doc/user/usermanual.xml b/src/doc/user/usermanual.xml index fefe4b3f..b532190a 100644 --- a/src/doc/user/usermanual.xml +++ b/src/doc/user/usermanual.xml @@ -452,9 +452,11 @@ Document types + &RCL; knows about quite a few different document - types. The parameters for document types recognition and - processing are set in configuration files. + types. The parameters for document types recognition and + processing are set in + configuration files. Most file types, like HTML or word processing files, only hold @@ -484,6 +486,20 @@ missing text file inside the configuration directory. + After installing a missing handler, you may need to + tell recollindex + to retry the failed files, by adding option -k + to the command line, or by using the GUI + + File + Special indexing + menu. This is because recollindex, + in its default operation mode, will not retry files which caused an + error during an earlier pass. In special cases, it may be useful to + reset the data for a category of files before indexing. See + the recollindex manual page. If your index is + not too big, it may be simpler to just reset it. + By default, &RCL; will try to index any file type that it has a way to read. This is sometimes not desirable, and there are ways to either exclude some types, or on the @@ -493,16 +509,19 @@ Excluding files by name can be done by adding wildcard name patterns to the - skippedNames + + skippedNames list, which can be done from the GUI Index configuration menu. Excluding by type can be done by setting the - excludedmimetypes + + excludedmimetypes list in the configuration file (1.20 and later). This can be redefined for subdirectories. You can also define an exclusive list of MIME types to be indexed (no others will be indexed), by settting - the indexedmimetypes + the + indexedmimetypes configuration variable. Example: indexedmimetypes = text/html application/pdf diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp index 6c54e412..6ffe9e46 100644 --- a/src/utils/smallut.cpp +++ b/src/utils/smallut.cpp @@ -1404,8 +1404,11 @@ unsigned int stringToFlags(const vector& flags, stringToTokens(input, toks, sep); for (auto& tok: toks) { trimstring(tok); - out += std::accumulate(flags.begin(), flags.end(), out, - [&](int o, CharFlags flag){ return tok == flag.yesname ? o | flag.value : o; }); + out = std::accumulate( + flags.begin(), flags.end(), out, + [&](unsigned int o, CharFlags flag) { + return tok == flag.yesname ? o | flag.value : o; + }); } return out; }