This commit is contained in:
dockes 2008-07-29 08:25:43 +00:00
parent 24ac62eb86
commit 269efce55e
2 changed files with 47 additions and 23 deletions

View File

@ -16,7 +16,7 @@
*/ */
#ifndef _DB_H_INCLUDED_ #ifndef _DB_H_INCLUDED_
#define _DB_H_INCLUDED_ #define _DB_H_INCLUDED_
/* @(#$Id: rcldb.h,v 1.59 2008-07-29 06:25:29 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: rcldb.h,v 1.60 2008-07-29 08:25:43 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <list> #include <list>
@ -106,8 +106,9 @@ class Db {
/* Update-related methods ******************************************/ /* Update-related methods ******************************************/
/** Test if the db entry for the given udi is up to date. This /** Test if the db entry for the given udi is up to date (by
* has the side-effect of setting the existence flag for the file document * comparing the input and stored sigs).
* Side-effect: set the existence flag for the file document
* and all subdocs if any (for later use by 'purge()') * and all subdocs if any (for later use by 'purge()')
*/ */
bool needUpdate(const string &udi, const string& sig); bool needUpdate(const string &udi, const string& sig);
@ -123,10 +124,12 @@ class Db {
/** Remove documents that no longer exist in the file system. This /** Remove documents that no longer exist in the file system. This
* depends on the update map, which is built during * depends on the update map, which is built during
* indexation. This should only be called after a full walk of * indexation (needUpdate()).
*
* This should only be called after a full walk of
* the file system, else the update map will not be complete, and * the file system, else the update map will not be complete, and
* many documents will be deleted that shouldn't, which is why this * many documents will be deleted that shouldn't, which is why this
* has to be called externally, we can't know if the indexing * has to be called externally, rcldb can't know if the indexing
* pass was complete or partial. * pass was complete or partial.
*/ */
bool purge(); bool purge();

View File

@ -16,7 +16,7 @@
*/ */
#ifndef _RCLDOC_H_INCLUDED_ #ifndef _RCLDOC_H_INCLUDED_
#define _RCLDOC_H_INCLUDED_ #define _RCLDOC_H_INCLUDED_
/* @(#$Id: rcldoc.h,v 1.6 2008-07-29 06:25:29 dockes Exp $ (C) 2006 J.F.Dockes */ /* @(#$Id: rcldoc.h,v 1.7 2008-07-29 08:25:43 dockes Exp $ (C) 2006 J.F.Dockes */
#include <string> #include <string>
#include <map> #include <map>
@ -28,11 +28,19 @@ namespace Rcl {
#endif #endif
/** /**
* Dumb holder for document attributes and data * Dumb holder for document attributes and data.
*
* This is used both for indexing, where fields are filled-up by the
* indexer prior to adding to the index, and for querying, where
* fields are filled from data stored in the index. Not all fields are
* in use at both index and query times, and not all field data is
* stored at index time (for example the "text" field is split and
* indexed, but not stored as such)
*/ */
class Doc { class Doc {
public: public:
// These fields potentially go into the document data record ////////////////////////////////////////////////////////////
// The following fields are stored into the document data record
// We indicate the routine that sets them up during indexing // We indicate the routine that sets them up during indexing
// This is just "file://" + binary filename. No transcoding: this // This is just "file://" + binary filename. No transcoding: this
@ -49,21 +57,29 @@ class Doc {
// Set by DbIndexer::processone // Set by DbIndexer::processone
string ipath; string ipath;
string mimetype; // Set by FileInterner::internfile // Mime type. Set by FileInterner::internfile
string fmtime; // File modification time as decimal ascii unix time string mimetype;
// Set by DbIndexer::processone
string dmtime; // Data reference date (same format). Ie: mail date
// Possibly set by handler
string origcharset; // Charset we transcoded from (in case we want back)
// Possibly set by handler
// A map for textual metadata like, author, keywords, abstract, title // File modification time as decimal ascii unix time
// Entries possibly set by handler. If a field-name to prefix translation // Set by DbIndexer::processone
// exists, the terms will be indexed with a prefix. string fmtime;
// Data reference date (same format). Ie: mail date
// Possibly set by mimetype-specific handler
string dmtime;
// Charset we transcoded the 'text' field from (in case we want back)
// Possibly set by handler
string origcharset;
// A map for textual metadata like, author, keywords, abstract,
// title. The entries are possibly set by the mimetype-specific
// handler. If a field-name to prefix translation exists, the
// terms will be indexed with a prefix.
map<string, string> meta; map<string, string> meta;
// Attribute for the "abstract" entry. true if it is just the top // Attribute for the "abstract" entry. true if it is just the top
// of doc, not a native document attribute // of doc, not a native document attribute.
bool syntabs; bool syntabs;
// File size. Index: Set by caller prior to Db::Add. Query: set by // File size. Index: Set by caller prior to Db::Add. Query: set by
@ -72,6 +88,7 @@ class Doc {
// would be a need for a 3rd value for multidoc files (file // would be a need for a 3rd value for multidoc files (file
// size/doc size/ doc text size) // size/doc size/ doc text size)
string fbytes; string fbytes;
// Doc text size. Index: from text.length(). Query: set by rcldb from // Doc text size. Index: from text.length(). Query: set by rcldb from
// index doc data. // index doc data.
string dbytes; string dbytes;
@ -82,14 +99,18 @@ class Doc {
// ctime+size, md5, whatever. // ctime+size, md5, whatever.
string sig; string sig;
// The following fields don't go to the db record /////////////////////////////////////////////////
// The following fields don't go to the db record, so they can't
string text; // During indexing only: text returned by input handler will // be retrieved at query time
// be split and indexed
// Main document text. This is plaintext utf-8 text to be split
// and indexed
string text;
int pc; // used by sortseq, convenience int pc; // used by sortseq, convenience
unsigned long xdocid; // Opaque: rcldb doc identifier. unsigned long xdocid; // Opaque: rcldb doc identifier.
///////////////////////////////////////////////////////////////////
void erase() { void erase() {
url.erase(); url.erase();
utf8fn.erase(); utf8fn.erase();