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

use both size and mtime changes as updateneeding indicator

Browse Source
This commit is contained in:
dockes 2006-11-07 12:02:39 +00:00
parent 624a6a5f3a
commit 86cff74c15
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.86 2006-11-06 17:37:22 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.87 2006-11-07 12:02:39 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -710,6 +710,8 @@ bool Db::needUpdate(const string &filename, const struct stat *stp)
return true; return true;
} }
Xapian::Document doc = m_ndb->db.get_document(*docid); Xapian::Document doc = m_ndb->db.get_document(*docid);
// Retrieve file modification time from db stored value
#ifdef MTIME_IN_VALUE #ifdef MTIME_IN_VALUE
// This is slightly faster, but we'd need to setup a conversion // This is slightly faster, but we'd need to setup a conversion
// for old dbs, and it's not really worth it // for old dbs, and it's not really worth it
@ -726,10 +728,19 @@ bool Db::needUpdate(const string &filename, const struct stat *stp)
cp+= 6; cp+= 6;
} }
#endif #endif
long mtime = cp ? atol(cp) : 0; time_t mtime = cp ? atoll(cp) : 0;
if (mtime < stp->st_mtime) {
LOGDEB2(("Db::needUpdate: yes: mtime: Db %ld file %ld\n", // Retrieve file size as stored in db data
(long)mtime, (long)stp->st_mtime)); cp = strstr(data.c_str(), "fbytes=");
if (cp)
cp += 7;
off_t fbytes = cp ? atoll(cp) : 0;
// Compare db time and size data to filesystem's
if (mtime != stp->st_mtime || fbytes != stp->st_size) {
LOGDEB2(("Db::needUpdate:yes: mtime: D %ld F %ld."
"sz D %ld F %ld\n", long(mtime), long(stp->st_mtime),
long(fbytes), long(stp->st_size)));
// Db is not up to date. Let's index the file // Db is not up to date. Let's index the file
return true; return true;
} }