Blame htdig-3.2.0-external_parsers.patch
|
Adam Tkac |
9b7f61c |
--- htdig-3.2.0b6/htdig/ExternalParser.cc.orig 2004-05-28 08:15:14.000000000 -0500
|
|
Adam Tkac |
9b7f61c |
+++ htdig-3.0.0b6/htdig/ExternalParser.cc 2005-09-15 11:41:05.000000000 -0500
|
|
Adam Tkac |
9b7f61c |
@@ -227,7 +227,7 @@ ExternalParser::parse(Retriever &retriev
|
|
Adam Tkac |
9b7f61c |
int get_file = (convertToType.length() != 0);
|
|
Adam Tkac |
9b7f61c |
String newcontent;
|
|
Adam Tkac |
9b7f61c |
|
|
Adam Tkac |
9b7f61c |
- StringList cpargs(currentParser);
|
|
Adam Tkac |
9b7f61c |
+ StringList cpargs(currentParser, " \t");
|
|
Adam Tkac |
9b7f61c |
char **parsargs = new char * [cpargs.Count() + 5];
|
|
Adam Tkac |
9b7f61c |
int argi;
|
|
Adam Tkac |
9b7f61c |
for (argi = 0; argi < cpargs.Count(); argi++)
|
|
Adam Tkac |
9b7f61c |
@@ -280,7 +280,11 @@ ExternalParser::parse(Retriever &retriev
|
|
Adam Tkac |
9b7f61c |
// Call External Parser
|
|
Adam Tkac |
9b7f61c |
execv(parsargs[0], parsargs);
|
|
Adam Tkac |
9b7f61c |
|
|
Adam Tkac |
9b7f61c |
- exit(EXIT_FAILURE);
|
|
Adam Tkac |
9b7f61c |
+ perror("execv");
|
|
Adam Tkac |
9b7f61c |
+ write(STDERR_FILENO, "External parser error: Can't execute ", 37);
|
|
Adam Tkac |
9b7f61c |
+ write(STDERR_FILENO, parsargs[0], strlen(parsargs[0]));
|
|
Adam Tkac |
9b7f61c |
+ write(STDERR_FILENO, "\n", 1);
|
|
Adam Tkac |
9b7f61c |
+ _exit(EXIT_FAILURE);
|
|
Adam Tkac |
9b7f61c |
}
|
|
Adam Tkac |
9b7f61c |
|
|
Adam Tkac |
9b7f61c |
// Parent Process
|
|
Adam Tkac |
9b7f61c |
@@ -424,7 +428,7 @@ ExternalParser::parse(Retriever &retriev
|
|
Adam Tkac |
9b7f61c |
{
|
|
Adam Tkac |
9b7f61c |
metadatetags = new StringMatch();
|
|
Adam Tkac |
9b7f61c |
metadatetags->IgnoreCase();
|
|
Adam Tkac |
9b7f61c |
- metadatetags->Pattern("date|dc.date|dc.date.created|dc.data.modified");
|
|
Adam Tkac |
9b7f61c |
+ metadatetags->Pattern("date|dc.date|dc.date.created|dc.date.modified");
|
|
Adam Tkac |
9b7f61c |
}
|
|
Adam Tkac |
9b7f61c |
|
|
Adam Tkac |
9b7f61c |
// <URL:http://www.w3.org/MarkUp/html-spec/html-spec_5.html#SEC5.2.5>
|