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

*** empty log message ***

Browse Source
This commit is contained in:
dockes 2005-11-25 08:53:13 +00:00
parent ccb27e07b4
commit 68b7887eb3
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile,v 1.18 2005-11-23 10:57:23 dockes Exp $ (C) 2005 J.F.Dockes # @(#$Id: Makefile,v 1.19 2005-11-25 08:51:47 dockes Exp $ (C) 2005 J.F.Dockes
# Default values. These can be overridden on the command line ie: # Default values. These can be overridden on the command line ie:
# make prefix=/usr # make prefix=/usr
@ -41,10 +41,12 @@ clean:
rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll
distclean: clean distclean: clean
rm -f mk/sysconf rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf recollinstall
install: all install: all
./recollinstall ${prefix} ./recollinstall ${prefix}
installme: installme:
./recollinstall ./recollinstall
.PHONY: all static clean distclean install installme

4
src/internfile/mimehandler.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.15 2005-11-25 08:52:39 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
#include <iostream> #include <iostream>
@ -42,7 +42,7 @@ MimeHandler *getMimeHandler(const string &mtype, RclConfig *cfg)
// Break definition into type and name // Break definition into type and name
list<string> toks; list<string> toks;
ConfTree::stringToStrings(hs, toks); stringToStrings(hs, toks);
if (toks.empty()) { if (toks.empty()) {
LOGERR(("getMimeHandler: bad mimeconf line for %s\n", mtype.c_str())); LOGERR(("getMimeHandler: bad mimeconf line for %s\n", mtype.c_str()));
return 0; return 0;

33
src/rcldb/rcldb.h
View File

@ -1,6 +1,6 @@
#ifndef _DB_H_INCLUDED_ #ifndef _DB_H_INCLUDED_
#define _DB_H_INCLUDED_ #define _DB_H_INCLUDED_
/* @(#$Id: rcldb.h,v 1.17 2005-11-14 09:56:49 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: rcldb.h,v 1.18 2005-11-25 08:53:13 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <list> #include <list>
@ -87,12 +87,7 @@ class AdvSearchData {
* Wrapper class for the native database. * Wrapper class for the native database.
*/ */
class Db { class Db {
AdvSearchData asdata; public:
vector<int> dbindices; // In case there is a postq filter: sequence of
// db indices that match
void *pdata; // Pointer to private data. We don't want db(ie
// xapian)-specific defs to show in here
public:
Db(); Db();
~Db(); ~Db();
enum OpenMode {DbRO, DbUpd, DbTrunc}; enum OpenMode {DbRO, DbUpd, DbTrunc};
@ -116,15 +111,29 @@ class Db {
const string& stemlang = "english"); const string& stemlang = "english");
bool getQueryTerms(list<string>& terms); bool getQueryTerms(list<string>& terms);
// Get document at rank i. This is probably vastly inferior to the type /** Get document at rank i in current query.
// of interface in Xapian, but we have to start with something simple
// to experiment with the GUI. i is sequential from 0 to some value This is probably vastly inferior to the type of interface in
Xapian, but we have to start with something simple to
experiment with the GUI. i is sequential from 0 to some value.
*/
bool getDoc(int i, Doc &doc, int *percent = 0); bool getDoc(int i, Doc &doc, int *percent = 0);
// Get results count
/** Get document for given filename and ipath */
bool getDoc(const string &fn, const string &ipath, Doc &doc);
/** Get results count for current query */
int getResCnt(); int getResCnt();
friend class Rcl::DbPops; friend class Rcl::DbPops;
private:
private:
AdvSearchData asdata;
vector<int> dbindices; // In case there is a postq filter: sequence of
// db indices that match
void *pdata; // Pointer to private data. We don't want db(ie
// xapian)-specific defs to show in here
/* Copyconst and assignemt private and forbidden */ /* Copyconst and assignemt private and forbidden */
Db(const Db &) {} Db(const Db &) {}
Db & operator=(const Db &) {return *this;}; Db & operator=(const Db &) {return *this;};