adapt kio and recollq to the new internfile interface

src/query/recollq.cpp

@@ -43,14 +43,8 @@ using namespace std;
 #include "wipedir.h"
 #include "transcode.h"
 
-bool dump_contents(RclConfig *rclconfig, string& tmpdir, Rcl::Doc& doc)
+bool dump_contents(RclConfig *rclconfig, string& tmpdir, Rcl::Doc& idoc)
 {
-    string fn = doc.url.substr(7);
-    struct stat st;
-    if (stat(fn.c_str(), &st) != 0) {
-	cout << "No such file: " << fn << endl;
-	return true;
-    } 
     if (tmpdir.empty() || access(tmpdir.c_str(), 0) < 0) {
 	string reason;
 	if (!maketmpdir(tmpdir, reason)) {
@@ -60,12 +54,14 @@ bool dump_contents(RclConfig *rclconfig, string& tmpdir, Rcl::Doc& doc)
 	}
     }
     wipedir(tmpdir);
-    FileInterner interner(fn, &st, rclconfig, tmpdir, 
-                          FileInterner::FIF_forPreview, &doc.mimetype);
-    if (interner.internfile(doc, doc.ipath)) {
-	cout << doc.text << endl;
+    FileInterner interner(idoc, rclconfig, tmpdir, 
+                          FileInterner::FIF_forPreview);
+    Rcl::Doc fdoc;
+    string ipath = idoc.ipath;
+    if (interner.internfile(fdoc, ipath)) {
+	cout << fdoc.text << endl;
     } else {
-	cout << "Cant intern: " << fn << endl;
+	cout << "Cant turn to text:" << idoc.url << " | " << idoc.ipath << endl;
     }
     return true;
 }

src/query/xadump.cpp

@@ -17,6 +17,7 @@ static char rcsid[] = "@(#$Id: xadump.cpp,v 1.20 2008-12-18 14:11:01 dockes Exp
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <strings.h>