diff --git a/src/VERSION b/src/VERSION index 0044d6cb..3500250a 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.20.1 +1.21.0 diff --git a/src/doc/user/usermanual.xml b/src/doc/user/usermanual.xml index 3dcf8452..90cdd067 100644 --- a/src/doc/user/usermanual.xml +++ b/src/doc/user/usermanual.xml @@ -2966,10 +2966,12 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r An element is composed of an optional field specification, and a value, separated by a colon (the field separator is the last - colon in the element). Example: + colon in the element). Examples: Eugenie, author:balzac, - dc:title:grandet + dc:title:grandet + dc:title:"eugenie grandet" + The colon, if present, means "contains". Xesam defines other relations, which are mostly unsupported for now (except in special @@ -2994,9 +2996,13 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r word3. Explicit parenthesis are not supported. + As of &RCL; 1.21, you can use parentheses to group + elements, which will sometimes make things clearer, and may + allow expressing combinations which would have been difficult + otherwise. + An element preceded by a - specifies a - term that should not appear. Pure negative - queries are forbidden. + term that should not appear. As usual, words inside quotes define a phrase (the order of words is significant), so that @@ -3004,6 +3010,14 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r title:prejudice title:pride, and is unlikely to find a result. + Words inside phrases and capitalized words are not + stem-expanded. Wildcards may be used anywhere inside a term. + Specifying a wild-card on the left of a term can produce a very + slow search (or even an incorrect one if the expansion is + truncated because of excessive size). Also see + + More about wildcards. + To save you some typing, recent &RCL; versions (1.20 and later) interpret a comma-separated list of terms as an AND list inside the field. Use slash characters ('/') for an OR list. No white space @@ -3014,10 +3028,12 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r author:john/ringo would search for john or ringo. - Modifiers can be set on a phrase clause, for example to specify + Modifiers can be set on a double-quote value, for example to specify a proximity search (unordered). See the modifier - section. + section. No space must separate the final + double-quote and the modifiers value, e.g. "two + one"po10 &RCL; currently manages the following default fields: @@ -3044,7 +3060,7 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r any). - filename for the document's + filename for the document's file name. This is not necessarily set for all documents: internal documents contained inside a compound one (for example an EPUB section) do not inherit the container file name any more, @@ -3053,7 +3069,7 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r implied by the document format, for example the attachment file name for an email attachment. - containerfilename. This is + containerfilename. This is set for all documents, both top-level and contained sub-documents, and is always the name of the filesystem directory entry which contains the data. The terms from this field can @@ -3084,7 +3100,8 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r dir for filtering the results on file location - (Ex: dir:/home/me/somedir). -dir + (Ex: dir:/home/me/somedir). + -dir also works to find results not in the specified directory (release >= 1.15.8). Tilde expansion will be performed as usual (except for a bug in versions 1.19 to @@ -3203,15 +3220,7 @@ dir:recoll dir:src -dir:utils -dir:common - either. - - - Words inside phrases and capitalized words are not - stem-expanded. Wildcards may be used anywhere inside a term. - Specifying a wild-card on the left of a term can produce a very - slow search (or even an incorrect one if the expansion is - truncated because of excessive size). Also see - - More about wildcards. + The document input handlers used while indexing have the possibility to create other fields with arbitrary names, and diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp index 261fbe13..f6cdb643 100644 --- a/src/qtgui/ssearch_w.cpp +++ b/src/qtgui/ssearch_w.cpp @@ -155,10 +155,10 @@ void SSearch::searchTypeChanged(int typ) "field:term1 : 'term1' in field 'field'.
\n" " Standard field names/synonyms:
\n" " title/subject/caption, author/from, recipient/to, filename, ext.
\n" -" Pseudo-fields: dir, mime/format, type/rclcat, date.
\n" +" Pseudo-fields: dir, mime/format, type/rclcat, date, size.
\n" " Two date interval exemples: 2009-03-01/2009-05-20 2009-03-01/P2M.
\n" "term1 term2 OR term3 : term1 AND (term2 OR term3).
\n" -" No actual parentheses allowed.
\n" +" You can use parentheses to make things clearer.
\n" "\"term1 term2\" : phrase (must occur exactly). Possible modifiers:
\n" "\"term1 term2\"p : unordered proximity search with default distance.
\n" "Use Show Query link when in doubt about result and see manual (<F1>) for more detail.\n" diff --git a/website/features.html b/website/features.html index 1fddcee4..b5b021aa 100644 --- a/website/features.html +++ b/website/features.html @@ -272,9 +272,10 @@ application/x-tar = execm rcltar unrtf. Please note that up to version 0.21.3, unrtf mostly does not work with non western-european character sets. Many serious problems - (crashes and infinite loops) were fixed in unrtf 0.21.8, so - that's really what you want. Building Unrtf from source is - quick and easy. + (crashes with serious security implications and infinite + loops) were fixed in unrtf 0.21.8, so you really want to use + this or a newer release. Building Unrtf from source is quick + and easy.
  • TeX with untex. If there is no untex package for