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

clarify temp dir usage in internfile

Browse Source
This commit is contained in:
dockes 2007-02-08 12:25:49 +00:00
parent 91f6467a9c
commit e9de6371d8
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/internfile/internfile.h
View File

@ -16,7 +16,7 @@
*/ */
#ifndef _INTERNFILE_H_INCLUDED_ #ifndef _INTERNFILE_H_INCLUDED_
#define _INTERNFILE_H_INCLUDED_ #define _INTERNFILE_H_INCLUDED_
/* @(#$Id: internfile.h,v 1.12 2007-02-06 18:01:58 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: internfile.h,v 1.13 2007-02-08 12:25:49 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <vector> #include <vector>
@ -49,7 +49,7 @@ class FileInterner {
* @param fn file name * @param fn file name
* @param cnf Recoll configuration * @param cnf Recoll configuration
* @param td temporary directory to use as working space if * @param td temporary directory to use as working space if
* decompression needed. * decompression needed. Must be private and will be wiped clean.
* @param mtype mime type if known. For a compressed file this is the * @param mtype mime type if known. For a compressed file this is the
* mime type for the uncompressed version. This currently doubles up * mime type for the uncompressed version. This currently doubles up
* to indicate that this object is for previewing (not indexing). * to indicate that this object is for previewing (not indexing).

23
src/query/recollq.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: recollq.cpp,v 1.2 2007-02-07 16:31:59 dockes Exp $ (C) 2006 J.F.Dockes"; static char rcsid[] = "@(#$Id: recollq.cpp,v 1.3 2007-02-08 12:25:49 dockes Exp $ (C) 2006 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
@ -38,6 +38,7 @@ using namespace std;
#include "wasastringtoquery.h" #include "wasastringtoquery.h"
#include "wasatorcl.h" #include "wasatorcl.h"
#include "internfile.h" #include "internfile.h"
#include "wipedir.h"
static char *thisprog; static char *thisprog;
static char usage [] = static char usage [] =
@ -145,6 +146,7 @@ int main(int argc, char **argv)
int cnt = rcldb.getResCnt(); int cnt = rcldb.getResCnt();
cout << cnt << " results " << cout << cnt << " results " <<
(cnt <= limit ? "" : "(printing 100 max):") << endl; (cnt <= limit ? "" : "(printing 100 max):") << endl;
string tmpdir;
for (int i = offset; i < offset + limit; i++) { for (int i = offset; i < offset + limit; i++) {
int pc; int pc;
Rcl::Doc doc; Rcl::Doc doc;
@ -168,14 +170,31 @@ int main(int argc, char **argv)
cout << "No such file: " << fn << endl; cout << "No such file: " << fn << endl;
continue; continue;
} }
FileInterner interner(fn, &st, rclconfig, "/tmp", &doc.mimetype); if (tmpdir.empty() || access(tmpdir.c_str(), 0) < 0) {
string reason;
if (!maketmpdir(tmpdir, reason)) {
fprintf(stderr, "cannot create temporary directory: %s\n",
reason.c_str());
return 1;
}
}
wipedir(tmpdir);
FileInterner interner(fn, &st, rclconfig, tmpdir, &doc.mimetype);
if (interner.internfile(doc, doc.ipath)) { if (interner.internfile(doc, doc.ipath)) {
cout << doc.text << endl; cout << doc.text << endl;
} else { } else {
cout << "Cant intern: " << fn << endl; cout << "Cant intern: " << fn << endl;
} }
} }
}
// Maybe clean up temporary directory
if (tmpdir.length()) {
wipedir(tmpdir);
if (rmdir(tmpdir.c_str()) < 0) {
fprintf(stderr, "cannot clear temp dir %s\n", tmpdir.c_str());
}
} }
return 0; return 0;