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

implemented stem databases

Browse Source
This commit is contained in:
dockes
2005-02-10 15:21:12 +00:00
parent 3fc0738c81
commit 1a897c47b3
9 changed files with 282 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/execmd.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: execmd.cpp,v 1.4 2005-02-08 09:34:47 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: execmd.cpp,v 1.5 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_EXECMD
#include <unistd.h>
@@ -131,7 +131,7 @@ ExecCmd::doexec(const string &cmd, const list<string> args,
close(pipeout[0]);
if (pipeout[1] >= 0)
close(pipeout[1]);
LOGDEB(("ExecCmd::doexec: father got status 0x%x\n", status));
LOGDEB1(("ExecCmd::doexec: father got status 0x%x\n", status));
return status;
} else {
if (input) {
src/utils/fstreewalk.cpp
+26 -20
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.2 2004-12-12 08:58:12 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.3 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_FSTREEWALK
@@ -53,8 +53,8 @@ int FsTreeWalker::getErrCnt()
return data->errors;
}
FsTreeWalker::Status FsTreeWalker::walk(const string &top, CbType fun,
void *cdata)
FsTreeWalker::Status FsTreeWalker::walk(const string &top,
FsTreeWalkerCB& cb)
{
Status status = FtwOk;
struct stat st;
@@ -68,12 +68,12 @@ FsTreeWalker::Status FsTreeWalker::walk(const string &top, CbType fun,
return FtwError;
}
if (S_ISDIR(st.st_mode)) {
if ((status = fun(cdata, top, &st, FtwDirEnter)) &
if ((status = cb.processone(top, &st, FtwDirEnter)) &
(FtwStop|FtwError)) {
return status;
}
} else if (S_ISREG(st.st_mode)) {
return fun(cdata, top, &st, FtwRegular);
return cb.processone(top, &st, FtwRegular);
} else {
return status;
}
@@ -110,17 +110,17 @@ FsTreeWalker::Status FsTreeWalker::walk(const string &top, CbType fun,
}
if (S_ISDIR(st.st_mode)) {
if (data->options & FtwNoRecurse) {
status = fun(cdata, fn, &st, FtwDirEnter);
status = cb.processone(fn, &st, FtwDirEnter);
} else {
status=walk(fn, fun, cdata);
status=walk(fn, cb);
}
if (status & (FtwStop|FtwError))
goto out;
if ((status = fun(cdata, top, &st, FtwDirReturn))
if ((status = cb.processone(top, &st, FtwDirReturn))
& (FtwStop|FtwError))
goto out;
} else if (S_ISREG(st.st_mode)) {
if ((status = fun(cdata, fn, &st, FtwRegular)) &
if ((status = cb.processone(fn, &st, FtwRegular)) &
(FtwStop|FtwError)) {
goto out;
}
@@ -143,17 +143,22 @@ FsTreeWalker::Status FsTreeWalker::walk(const string &top, CbType fun,
using namespace std;
FsTreeWalker::Status walkfunc(void *, const string &path,
const struct stat *st,
FsTreeWalker::CbFlag flg)
{
if (flg == FsTreeWalker::FtwDirEnter) {
cout << "[Entering " << path << "]" << endl;
} else if (flg == FsTreeWalker::FtwRegular) {
cout << path << endl;
class myCB : public FsTreeWalkerCB {
public:
FsTreeWalker::Status processone(const string &path,
const struct stat *st,
FsTreeWalker::CbFlag flg)
{
if (flg == FsTreeWalker::FtwDirEnter) {
cout << "[Entering " << path << "]" << endl;
} else if (flg == FsTreeWalker::FtwDirReturn) {
cout << "[Returning to " << path << "]" << endl;
} else if (flg == FsTreeWalker::FtwRegular) {
cout << path << endl;
}
return FsTreeWalker::FtwOk;
}
return FsTreeWalker::FtwOk;
}
};
int main(int argc, const char **argv)
{
@@ -162,7 +167,8 @@ int main(int argc, const char **argv)
exit(1);
}
FsTreeWalker walker;
walker.walk(argv[1], walkfunc, 0);
myCB cb;
walker.walk(argv[1], cb);
if (walker.getErrCnt() > 0)
cout << walker.getReason();
}
src/utils/fstreewalk.h
+14 -5
View File
@@ -1,9 +1,14 @@
#ifndef _FSTREEWALK_H_INCLUDED_
#define _FSTREEWALK_H_INCLUDED_
/* @(#$Id: fstreewalk.h,v 1.1 2004-12-10 18:13:13 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: fstreewalk.h,v 1.2 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string>
#ifndef NO_NAMESPACES
using std::string;
#endif
class FsTreeWalkerCB;
class FsTreeWalker {
public:
@@ -12,12 +17,9 @@ class FsTreeWalker {
FtwStatAll = FtwError|FtwStop};
enum Options {FtwOptNone = 0, FtwNoRecurse = 1, FtwFollow = 2};
typedef Status (*CbType)(void *cdata,
const std::string &, const struct stat *, CbFlag);
FsTreeWalker(Options opts = FtwOptNone);
~FsTreeWalker();
Status walk(const std::string &dir, CbType fun, void *cdata);
Status walk(const std::string &dir, FsTreeWalkerCB& cb);
std::string getReason();
int getErrCnt();
private:
@@ -25,4 +27,11 @@ class FsTreeWalker {
Internal *data;
};
class FsTreeWalkerCB {
public:
virtual ~FsTreeWalkerCB() {}
virtual FsTreeWalker::Status
processone(const string &, const struct stat *, FsTreeWalker::CbFlag)
= 0;
};
#endif /* _FSTREEWALK_H_INCLUDED_ */
src/utils/smallut.cpp
+12 -1
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.3 2005-02-09 12:07:30 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.4 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#ifndef TEST_SMALLUT
#include <string>
@@ -48,6 +48,17 @@ bool maketmpdir(string& tdir)
return true;
}
string stringlistdisp(const list<string>& sl)
{
string s;
for (list<string>::const_iterator it = sl.begin(); it!= sl.end(); it++)
s += "[" + *it + "] ";
if (!s.empty())
s.erase(s.length()-1);
return s;
}
int stringicmp(const string & s1, const string& s2)
{
string::const_iterator it1 = s1.begin();
src/utils/smallut.h
+4 -2
View File
@@ -1,14 +1,16 @@
#ifndef _SMALLUT_H_INCLUDED_
#define _SMALLUT_H_INCLUDED_
/* @(#$Id: smallut.h,v 1.3 2005-02-09 12:07:30 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: smallut.h,v 1.4 2005-02-10 15:21:12 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string>
#include <list>
using std::string;
using std::list;
extern int stringicmp(const string& s1, const string& s2);
extern int stringlowercmp(const string& alreadylower, const string& s2);
extern int stringuppercmp(const string& alreadyupper, const string& s2);
extern bool maketmpdir(string& tdir);
extern string stringlistdisp(const list<string>& strs);
#endif /* _SMALLUT_H_INCLUDED_ */