diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 83f82d89..37297575 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -13,7 +13,7 @@ PPA_KEYID=7808CE96D38B9201 -RCLVERS=1.29.3pre1 +RCLVERS=1.30.0 SCOPEVERS=1.20.2.4 GSSPVERS=1.1.0 PPAVERS=1 diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 414fe8cd..a888c6a3 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,8 +1,30 @@ -recoll (1.29.3pre2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low +recoll (1.30.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low - * UI experiments - - -- Jean-Francois Dockes Tue, 16 Mar 2021 14:00:00 +0100 + * Add a recollindex command line option to write diagnostics about not + indexed documents to a text file, and make it accessible from the + "special indexing" GUI menu. + * Add a recollindex command line option to print the indexing status for + a list of paths, e.g.: find /mydir | recollindex --notindexed + * Add recollindex command line options to compact the webcache, or + extract all entries to a target directory. + * Web indexing: allow multiple versions of a page to exist in the index, + and add a parameter to specify the page erase period. + * GUI: add View menu options to adjust the font size, with + Ctrl+Plus/Ctrl+Minus shortcuts. + * GUI: add popup menu option to copy the simple file name. + * GUI: add menu entry to save a webcache entry to a file. + * GUI: automate redisplaying the search results when switchin between + dark and regular display modes. + * GUI result table: fix the date format. + * GUI result table: shortcuts for jumping to a specific row. + * GUI result table: allow showing document text instead of metadata in + the detail area. + * GUI: add menu entries to copy a result document text to the clipboard. + * GUI: add shortcuts editor. + * GUI: move the dark/regular choice out of the View menu into the + preferences. + + -- Jean-Francois Dockes Thu, 01 Apr 2021 14:00:00 +0100 recoll (1.29.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low diff --git a/src/VERSION b/src/VERSION index 45cb7f9f..034552a8 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.29.3pre2 +1.30.0 diff --git a/src/common/autoconfig-win.h b/src/common/autoconfig-win.h index 3263f501..10a35991 100644 --- a/src/common/autoconfig-win.h +++ b/src/common/autoconfig-win.h @@ -121,7 +121,7 @@ #define PACKAGE_NAME "Recoll" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Recoll 1.29.2" +#define PACKAGE_STRING "Recoll 1.30.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "recoll" @@ -130,7 +130,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.29.2" +#define PACKAGE_VERSION "1.30.0" /* putenv parameter is const */ /* #undef PUTENV_ARG_CONST */ diff --git a/src/doc/man/recollindex.1 b/src/doc/man/recollindex.1 index 3726194d..2f479f17 100644 --- a/src/doc/man/recollindex.1 +++ b/src/doc/man/recollindex.1 @@ -16,7 +16,7 @@ recollindex \- indexing command for the Recoll full text search system .B \-k ] [ -.B \--diagfile +.B \--diagsfile ] .br .B recollindex @@ -154,7 +154,7 @@ defined by the "checkneedretryindexscript" configuration variable indicates that this should happen. .PP If option -.B \--diagfile +.B \--diagsfile is given, the path given as parameter will be truncated and indexing diagnostics will be written to it. Each line in the file will have a diagnostic type (reason for the file not to be indexed), the file path, and diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp index 64c5de0c..743ae5bd 100644 --- a/src/index/recollindex.cpp +++ b/src/index/recollindex.cpp @@ -94,13 +94,13 @@ static int op_flags; #define OPTVAL_WEBCACHE_COMPACT 1000 #define OPTVAL_WEBCACHE_BURST 1001 #define OPTVAL_DIAGS_NOTINDEXED 1002 -#define OPTVAL_DIAGS_DIAGFILE 1003 +#define OPTVAL_DIAGS_DIAGSFILE 1003 static struct option long_options[] = { {"webcache-compact", 0, 0, OPTVAL_WEBCACHE_COMPACT}, {"webcache-burst", required_argument, 0, OPTVAL_WEBCACHE_BURST}, {"notindexed", 0, 0, OPTVAL_DIAGS_NOTINDEXED}, - {"diagfile", required_argument, 0, OPTVAL_DIAGS_DIAGFILE}, + {"diagsfile", required_argument, 0, OPTVAL_DIAGS_DIAGSFILE}, {0, 0, 0, 0} }; @@ -450,7 +450,7 @@ static const char usage [] = " -Z : in place reset: consider all documents as changed. Can also\n" " be combined with -i or -r but not -m\n" " -k : retry files on which we previously failed\n" -" --diagfile : list skipped or otherwise not indexed documents to \n" +" --diagsfile : list skipped or otherwise not indexed documents to \n" " will be truncated\n" #ifdef RCL_MONITOR "recollindex -m [-w ] -x [-D] [-C]\n" @@ -637,7 +637,7 @@ int main(int argc, char *argv[]) bool diags_notindexed{false}; std::string burstdir; - std::string diagfile; + std::string diagsfile; while ((ret = getopt_long(argc, (char *const*)&args[0], "c:CDdEefhikKlmnPp:rR:sS:w:xZz", long_options, NULL)) != -1) { switch (ret) { @@ -678,7 +678,7 @@ int main(int argc, char *argv[]) case OPTVAL_WEBCACHE_COMPACT: webcache_compact = true; break; case OPTVAL_WEBCACHE_BURST: burstdir = optarg; webcache_burst = true;break; case OPTVAL_DIAGS_NOTINDEXED: diags_notindexed = true;break; - case OPTVAL_DIAGS_DIAGFILE: diagfile = optarg;break; + case OPTVAL_DIAGS_DIAGSFILE: diagsfile = optarg;break; default: Usage(); break; } } @@ -792,10 +792,10 @@ int main(int argc, char *argv[]) } } - if (!diagfile.empty()) { - if (!IdxDiags::theDiags().init(diagfile)) { - std::cerr << "Could not initialize diags file " << diagfile << "\n"; - LOGERR("recollindex: Could not initialize diags file " << diagfile << "\n"); + if (!diagsfile.empty()) { + if (!IdxDiags::theDiags().init(diagsfile)) { + std::cerr << "Could not initialize diags file " << diagsfile << "\n"; + LOGERR("recollindex: Could not initialize diags file " << diagsfile << "\n"); } } bool rezero((op_flags & OPT_z) != 0); diff --git a/src/index/webqueue.cpp b/src/index/webqueue.cpp index 46cfa01a..1159ba42 100644 --- a/src/index/webqueue.cpp +++ b/src/index/webqueue.cpp @@ -421,8 +421,10 @@ WebQueueIndexer::processone( goto out; //dotdoc.dump(1); - // Have to use the hit type for the udi, because the same url can exist - // as a bookmark or a page. + // Have to use the hit type for the udi, because the same url can + // exist as a bookmark or a page. Also add a date with the + // specified granularity so that multiple versions can be in the + // index. udipath = path_cat(dotdoc.meta[Rcl::Doc::keybght], url_gpath(dotdoc.url)); // !! is an arbitrary separator rather unlikely to be found in urls. switch (m_keepinterval) { @@ -433,7 +435,6 @@ WebQueueIndexer::processone( default: break; } - // Also append the current date (year+day): we store one page copy per day std::cerr << "UDI: " << udipath << "\n"; make_udi(udipath, cstr_null, udi); diff --git a/src/qtgui/rclm_idx.cpp b/src/qtgui/rclm_idx.cpp index 35b41776..3aa39aaa 100644 --- a/src/qtgui/rclm_idx.cpp +++ b/src/qtgui/rclm_idx.cpp @@ -497,7 +497,7 @@ void RclMain::specialIndex() string diagsfile = specidx->diagsfile(); if (!diagsfile.empty()) { - args.push_back("--diagfile"); + args.push_back("--diagsfile"); args.push_back(diagsfile); }