diff options
| -rwxr-xr-x | src/crawl/crawl.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/crawl/crawl.cpp b/src/crawl/crawl.cpp index 1b409bc..7d6622e 100755 --- a/src/crawl/crawl.cpp +++ b/src/crawl/crawl.cpp @@ -100,31 +100,24 @@ int main( int /* argc */, char *argv[] ) vector<string> entries = directory_entries( modulePath, true, modulesSearchRecursive ); vector<string> modules = luaVm.getStringArray( "modules.urlnormalizers" ); + vector<string> normalizerModules; vector<string>::const_iterator it2, end2 = modules.end( ); for( it2 = modules.begin( ); it2 != end2; it2++ ) { #ifndef _WIN32 - string module = (*it2) + ".so"; + string module = *it2 + ".so"; #else - string module = (*it2) + ".dll"; + string module = *it2 + ".dll"; #endif cout << "Searching for module '" << module << "'" << endl; vector<string>::const_iterator it, end = entries.end( ); for( it = entries.begin( ); it != end; it++ ) { - if( endswith( (*it), module ) ) { - cout << " Found in file '" << (*it) << "'" << endl; + if( endswith( *it, module ) ) { + cout << " Found in file '" << *it << "'" << endl; + normalizerModules.push_back( *it ); } } } - - vector<string> normalizerModules; -#ifndef _WIN32 - normalizerModules.push_back( "./modules/urlnormalizer/simpleurl/mod_urlnormalizer_simple.so" ); - normalizerModules.push_back( "./modules/urlnormalizer/googleurl/mod_urlnormalizer_googleurl.so" ); -#else - normalizerModules.push_back( ".\\modules\\urlnormalizer\\simpleurl\\mod_urlnormalizer_simple.dll" ); - normalizerModules.push_back( ".\\modules\\urlnormalizer\\googleurl\\mod_urlnormalizer_googleurl.dll" ); -#endif ModuleLoader<URLNormalizer> urlNormalizers( normalizerModules, CLOSE_DEFERRED, (void *)&luaVm ); // initialize crawler function |