diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2012-08-07 11:56:16 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2012-08-07 11:56:16 +0200 |
| commit | 9dfe4aa8f2fe2fc93479e4b806aafc0cdd76f650 (patch) | |
| tree | 70930568daa261300e31baca29e08a75955a7076 /tests/url | |
| parent | d61420eab67f2acab8ea6e3b51a4e763a3259569 (diff) | |
| download | crawler-9dfe4aa8f2fe2fc93479e4b806aafc0cdd76f650.tar.gz crawler-9dfe4aa8f2fe2fc93479e4b806aafc0cdd76f650.tar.bz2 | |
allow modules to be linked as static libraries, mainly to be able to
use valgrind for leak-checking
Diffstat (limited to 'tests/url')
| -rw-r--r-- | tests/url/GNUmakefile | 10 | ||||
| -rw-r--r-- | tests/url/test1.cpp | 26 |
2 files changed, 32 insertions, 4 deletions
diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile index df37f62..8ce49bd 100644 --- a/tests/url/GNUmakefile +++ b/tests/url/GNUmakefile @@ -3,12 +3,18 @@ TOPDIR = ../.. SUBDIRS = INCLUDE_DIRS = \ - -I$(TOPDIR)/src + -I$(TOPDIR)/src \ + -I$(TOPDIR)/src/modules/urlnormalizer/simpleurl \ + -I$(TOPDIR)/src/modules/urlnormalizer/googleurl INCLUDE_LDFLAGS = INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ + $(TOPDIR)/src/modules/urlnormalizer/googleurl/libgoogleurlnormalizer.a \ + $(TOPDIR)/googleurl/libgoogleurl.a \ + -licui18n -licuuc TEST_CPP_BINS = \ test1$(EXE) diff --git a/tests/url/test1.cpp b/tests/url/test1.cpp index 9c0faa6..b2ee90e 100644 --- a/tests/url/test1.cpp +++ b/tests/url/test1.cpp @@ -1,6 +1,11 @@ #include "URL.hpp" +#ifdef USE_MODULELOADER #include "URLNormalizer.hpp" #include "ModuleLoader.hpp" +#else +#include "SimpleURLNormalizer.hpp" +#include "GoogleURLNormalizer.hpp" +#endif #include <vector> #include <iostream> @@ -21,12 +26,25 @@ int main( int argc, char *argv[] ) char *baseUrlString = argv[3]; char *partialUrlString = argv[4]; +#ifdef USE_MODULELOADER vector<string> modules; modules.push_back( "../../src/modules/urlnormalizer/simpleurl/mod_urlnormalizer_simple.so" ); modules.push_back( "../../src/modules/urlnormalizer/googleurl/mod_urlnormalizer_googleurl.so" ); ModuleLoader<URLNormalizer> urlNormalizers( modules ); - + URLNormalizer *normalizer = urlNormalizers.create( method ); +#else + URLNormalizer *normalizer; + if( strcmp( method, "simple" ) == 0 ) { + normalizer = new SimpleURLNormalizer( ); + } else if( strcmp( method, "google" ) == 0 ) { + normalizer = new GoogleURLNormalizer( ); + } else { + cerr << "Unknown normalization method '" << method << "'" << endl; + return 1; + } +#endif + URL url; @@ -58,7 +76,11 @@ int main( int argc, char *argv[] ) cout << "URL: " << url << endl; +#ifdef USE_MODULELOADER urlNormalizers.destroy( normalizer ); - +#else + delete normalizer; +#endif + return 0; } |