tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get things to build on centos7.5 (cosmetic changes)

Browse Source
This commit is contained in:
Jean-Francois Dockes 2018-09-02 18:47:03 +02:00
parent 433430dfe6
commit 8358742132
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -556,7 +556,7 @@ VERSION
# php/00README.txt php/recoll/config.m4 php/recoll/make.sh
# php/recoll/php_recoll.h php/recoll/recoll.cpp php/sample/shell.php
OPTSFORPYTHON != test -f /etc/debian_version && echo --install-layout=deb
OPTSFORPYTHON = $(shell test -f /etc/debian_version && echo --install-layout=deb)
if MAKEPYTHON
all-local:: recollpython
@ -600,7 +600,7 @@ rclpychm-install:
)
rclpychm-clean:
rm -rf python/pychm/build
rm -r python/pychm/dist/*
rm -rf python/pychm/dist/*
endif
if MAKEQT

3
src/query/plaintorich.cpp
View File

@ -155,10 +155,11 @@ bool TextSplitPTR::matchGroups()
// for validating, or catching things which are probably urls but miss
// a scheme (e.g. www.xxx.com/index.html), because complicated.
static const string urlRE = "(https?://[[:alnum:]~_/.%?&=,#@]+)[[:space:]|]";
static const string urlRep{"<a href=\"$1\">$1</a>"};
static std::regex url_re(urlRE);
static string activate_urls(const string& in)
{
return std::regex_replace(in, url_re, "<a href=\"$1\">$1</a>");
return std::regex_replace(in, url_re, urlRep);
}
// Fix result text for display inside the gui text window.

3
src/rcldb/rclabsfromtext.cpp
View File

@ -54,9 +54,10 @@ static const string cstr_nc("\n\r\x0c\\");
static const string punctcls("[-<>._+,#*=|]");
static const string punctRE = "(" + punctcls + " *)(" + punctcls + " *)+";
static std::regex fixfrag_re(punctRE);
static const string punctRep{"$2"};
static string fixfrag(const string& infrag)
{
return std::regex_replace(neutchars(infrag, cstr_nc), fixfrag_re, "$2");
return std::regex_replace(neutchars(infrag, cstr_nc), fixfrag_re, punctRep);
}