Delete RCL_USE_XATTR configure/compile time variable, it was not
useful. Add configuration variable to use mtime instead of ctime for update detection. Useful on a system where xattrs would be modified but not indexed, to avoid excessive reindexing.
This commit is contained in:
@@ -17,8 +17,6 @@
|
||||
|
||||
#include "autoconfig.h"
|
||||
|
||||
#ifdef RCL_USE_XATTR
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include "rclconfig.h"
|
||||
@@ -145,5 +143,3 @@ void docFieldsFromMetaCmds(RclConfig *cfg, const map<string, string>& cfields,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif // RCL_USE_XATTR
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#include "autoconfig.h"
|
||||
|
||||
#ifdef RCL_USE_XATTR
|
||||
/** Extended attributes processing helper functions */
|
||||
|
||||
#include <map>
|
||||
@@ -47,6 +46,4 @@ extern void docFieldsFromMetaCmds(
|
||||
RclConfig *cfg, const std::map<std::string, std::string>& xfields,
|
||||
Rcl::Doc& doc);
|
||||
|
||||
#endif /* RCL_USE_XATTR */
|
||||
|
||||
#endif /* _REAPXATTRS_H_INCLUDED_ */
|
||||
|
||||
@@ -228,13 +228,11 @@ void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
|
||||
m_forPreview ? "view" : "index");
|
||||
df->set_property(Dijon::Filter::DJF_UDI, udi);
|
||||
|
||||
#ifdef RCL_USE_XATTR
|
||||
// Get fields computed from extended attributes. We use the
|
||||
// original file, not the m_fn which may be the uncompressed temp
|
||||
// file
|
||||
if (!m_noxattrs)
|
||||
reapXAttrs(m_cfg, f, m_XAttrsFields);
|
||||
#endif //RCL_USE_XATTR
|
||||
|
||||
// Gather metadata from external commands as configured.
|
||||
reapMetaCmds(m_cfg, f, m_cmdFields);
|
||||
@@ -574,11 +572,9 @@ void FileInterner::collectIpathAndMT(Rcl::Doc& doc) const
|
||||
LOGDEB2(("FileInterner::collectIpathAndMT\n"));
|
||||
bool hasipath = false;
|
||||
|
||||
#ifdef RCL_USE_XATTR
|
||||
if (!m_noxattrs) {
|
||||
docFieldsFromXattrs(m_cfg, m_XAttrsFields, doc);
|
||||
}
|
||||
#endif //RCL_USE_XATTR
|
||||
|
||||
docFieldsFromMetaCmds(m_cfg, m_cmdFields, doc);
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
*/
|
||||
#ifndef _INTERNFILE_H_INCLUDED_
|
||||
#define _INTERNFILE_H_INCLUDED_
|
||||
// The class changes according to RCL_USE_XATTR
|
||||
#include "autoconfig.h"
|
||||
|
||||
#include <string>
|
||||
@@ -252,13 +251,11 @@ class FileInterner {
|
||||
string m_reachedMType; // target or text/plain
|
||||
string m_tfile;
|
||||
bool m_ok; // Set after construction if ok
|
||||
#ifdef RCL_USE_XATTR
|
||||
// Fields found in file extended attributes. This is kept here,
|
||||
// not in the file-level handler because we are only interested in
|
||||
// the top-level file, not any temp file necessitated by
|
||||
// processing the internal doc hierarchy.
|
||||
map<string, string> m_XAttrsFields;
|
||||
#endif // RCL_USE_XATTR
|
||||
// Fields gathered by executing configured external commands
|
||||
map<string, string> m_cmdFields;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user