summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2014-10-04 23:04:00 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2014-10-04 23:04:00 +0200
commitd207e5a4f68cf56699b6f59487d3456f1c5e5f01 (patch)
tree8e93f7dff379ac422f1916d83d700739d8e15f5d
parent62901873f5b7e37beb81037caae5808396528270 (diff)
downloadcrawler-d207e5a4f68cf56699b6f59487d3456f1c5e5f01.tar.gz
crawler-d207e5a4f68cf56699b6f59487d3456f1c5e5f01.tar.bz2
adapted all interface in modules, but SEGV happens now in crawler,
module tests pass though
-rw-r--r--src/modules/deduper/null/NullDeduper.cpp2
-rw-r--r--src/modules/fetcher/file/FileFetcher.cpp2
-rw-r--r--src/modules/fetcher/libcurl/LibCurlFetcher.cpp2
-rw-r--r--src/modules/fetcher/libfetch/LibFetchFetcher.cpp2
-rwxr-xr-xsrc/modules/fetcher/winhttp/WinHttpFetcher.cpp2
-rw-r--r--src/modules/frontier/memory/MemoryFrontier.cpp2
-rw-r--r--src/modules/processor/htmllinkextract/HTMLLinkExtractProcessor.cpp2
-rw-r--r--src/modules/processor/robotstxt/RobotsTxtProcessor.cpp2
-rw-r--r--src/modules/processor/sitemap/SitemapProcessor.cpp2
-rw-r--r--src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp2
-rw-r--r--src/modules/urlfilter/chain/ChainURLFilter.cpp2
-rw-r--r--src/modules/urlfilter/host/HostURLFilter.cpp2
-rw-r--r--src/modules/urlfilter/protocol/ProtocolURLFilter.cpp2
-rwxr-xr-xsrc/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp2
-rwxr-xr-xsrc/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp2
-rw-r--r--src/modules/urlseen/memory/MemoryURLSeen.cpp2
16 files changed, 16 insertions, 16 deletions
diff --git a/src/modules/deduper/null/NullDeduper.cpp b/src/modules/deduper/null/NullDeduper.cpp
index 6d56cb0..c438464 100644
--- a/src/modules/deduper/null/NullDeduper.cpp
+++ b/src/modules/deduper/null/NullDeduper.cpp
@@ -1,3 +1,3 @@
#include "NullDeduper.hpp"
-REGISTER_MODULE( "null_deduper", Deduper, NullDeduper )
+REGISTER_MODULE( "null_deduper", 0, 0, Deduper, NullDeduper )
diff --git a/src/modules/fetcher/file/FileFetcher.cpp b/src/modules/fetcher/file/FileFetcher.cpp
index b344b3f..96c0ef4 100644
--- a/src/modules/fetcher/file/FileFetcher.cpp
+++ b/src/modules/fetcher/file/FileFetcher.cpp
@@ -9,4 +9,4 @@ RewindInputStream *FileFetcher::fetch( const URL url )
return s;
}
-REGISTER_MODULE( "file_fetcher", Fetcher, FileFetcher )
+REGISTER_MODULE( "file_fetcher", 0, 0, Fetcher, FileFetcher )
diff --git a/src/modules/fetcher/libcurl/LibCurlFetcher.cpp b/src/modules/fetcher/libcurl/LibCurlFetcher.cpp
index 4ace062..e4e6a4e 100644
--- a/src/modules/fetcher/libcurl/LibCurlFetcher.cpp
+++ b/src/modules/fetcher/libcurl/LibCurlFetcher.cpp
@@ -15,4 +15,4 @@ RewindInputStream *LibCurlFetcher::fetch( const URL url )
return s;
}
-REGISTER_MODULE( "libcurl_fetcher", Fetcher, LibCurlFetcher )
+REGISTER_MODULE( "libcurl_fetcher", 0, 0, Fetcher, LibCurlFetcher )
diff --git a/src/modules/fetcher/libfetch/LibFetchFetcher.cpp b/src/modules/fetcher/libfetch/LibFetchFetcher.cpp
index ee4649e..c71dddf 100644
--- a/src/modules/fetcher/libfetch/LibFetchFetcher.cpp
+++ b/src/modules/fetcher/libfetch/LibFetchFetcher.cpp
@@ -20,4 +20,4 @@ RewindInputStream *LibFetchFetcher::fetch( const URL url )
return s;
}
-REGISTER_MODULE( "libfetch_fetcher", Fetcher, LibFetchFetcher )
+REGISTER_MODULE( "libfetch_fetcher", 0, 0, Fetcher, LibFetchFetcher )
diff --git a/src/modules/fetcher/winhttp/WinHttpFetcher.cpp b/src/modules/fetcher/winhttp/WinHttpFetcher.cpp
index 8a0e395..5c8839d 100755
--- a/src/modules/fetcher/winhttp/WinHttpFetcher.cpp
+++ b/src/modules/fetcher/winhttp/WinHttpFetcher.cpp
@@ -32,4 +32,4 @@ RewindInputStream *WinHttpFetcher::fetch( const URL url )
return s;
}
-REGISTER_MODULE( "winhttp_fetcher", Fetcher, WinHttpFetcher )
+REGISTER_MODULE( "winhttp_fetcher", 0, 0, Fetcher, WinHttpFetcher )
diff --git a/src/modules/frontier/memory/MemoryFrontier.cpp b/src/modules/frontier/memory/MemoryFrontier.cpp
index 2311353..41fb619 100644
--- a/src/modules/frontier/memory/MemoryFrontier.cpp
+++ b/src/modules/frontier/memory/MemoryFrontier.cpp
@@ -1,3 +1,3 @@
#include "MemoryFrontier.hpp"
-REGISTER_MODULE( "memory_frontier", Frontier, MemoryFrontier )
+REGISTER_MODULE( "memory_frontier", 0, 0, Frontier, MemoryFrontier )
diff --git a/src/modules/processor/htmllinkextract/HTMLLinkExtractProcessor.cpp b/src/modules/processor/htmllinkextract/HTMLLinkExtractProcessor.cpp
index f575a0c..cd02bcb 100644
--- a/src/modules/processor/htmllinkextract/HTMLLinkExtractProcessor.cpp
+++ b/src/modules/processor/htmllinkextract/HTMLLinkExtractProcessor.cpp
@@ -68,4 +68,4 @@ void HTMLLinkExtractProcessor::process( RewindInputStream *s )
m_parser.Reset( );
}
-REGISTER_MODULE_4( "htmllinkextract_processor", Processor, HTMLLinkExtractProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
+REGISTER_MODULE_4( "htmllinkextract_processor", 0, 0, Processor, HTMLLinkExtractProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
diff --git a/src/modules/processor/robotstxt/RobotsTxtProcessor.cpp b/src/modules/processor/robotstxt/RobotsTxtProcessor.cpp
index 7c28544..6cc8a7e 100644
--- a/src/modules/processor/robotstxt/RobotsTxtProcessor.cpp
+++ b/src/modules/processor/robotstxt/RobotsTxtProcessor.cpp
@@ -84,4 +84,4 @@ void RobotsTxtProcessor::process( RewindInputStream *s )
}
}
-REGISTER_MODULE_4( "robotstxt_processor", Processor, RobotsTxtProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
+REGISTER_MODULE_4( "robotstxt_processor", 0, 0, Processor, RobotsTxtProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
diff --git a/src/modules/processor/sitemap/SitemapProcessor.cpp b/src/modules/processor/sitemap/SitemapProcessor.cpp
index 825010d..ac1c04f 100644
--- a/src/modules/processor/sitemap/SitemapProcessor.cpp
+++ b/src/modules/processor/sitemap/SitemapProcessor.cpp
@@ -91,4 +91,4 @@ void SitemapProcessor::process( RewindInputStream *s )
}
-REGISTER_MODULE_4( "sitemap_processor", Processor, SitemapProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
+REGISTER_MODULE_4( "sitemap_processor", 0, 0, Processor, SitemapProcessor, URLNormalizer *, Frontier *, URLFilter *, URLSeen * )
diff --git a/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp b/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
index 4582353..e51c5b3 100644
--- a/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
+++ b/src/modules/typedetect/libmagic/LibMagicTypeDetect.cpp
@@ -64,4 +64,4 @@ MIMEType LibMagicTypeDetect::detect( RewindInputStream *s )
return MIMEType( res );
}
-REGISTER_MODULE( "libmagic_typedetect", TypeDetect, LibMagicTypeDetect )
+REGISTER_MODULE( "libmagic_typedetect", 0, 0, TypeDetect, LibMagicTypeDetect )
diff --git a/src/modules/urlfilter/chain/ChainURLFilter.cpp b/src/modules/urlfilter/chain/ChainURLFilter.cpp
index b4a8cf3..e6e2250 100644
--- a/src/modules/urlfilter/chain/ChainURLFilter.cpp
+++ b/src/modules/urlfilter/chain/ChainURLFilter.cpp
@@ -16,4 +16,4 @@ bool ChainURLFilter::filter( const URL url )
return true;
}
-REGISTER_MODULE_1( "chain_urlfilter", URLFilter, ChainURLFilter, const std::list<URLFilter *> )
+REGISTER_MODULE_1( "chain_urlfilter", 0, 0, URLFilter, ChainURLFilter, const std::list<URLFilter *> )
diff --git a/src/modules/urlfilter/host/HostURLFilter.cpp b/src/modules/urlfilter/host/HostURLFilter.cpp
index dd03910..1aa6078 100644
--- a/src/modules/urlfilter/host/HostURLFilter.cpp
+++ b/src/modules/urlfilter/host/HostURLFilter.cpp
@@ -18,4 +18,4 @@ bool HostURLFilter::filter( const URL url )
return res;
}
-REGISTER_MODULE_1( "host_urlfilter", URLFilter, HostURLFilter, const std::set<std::string> )
+REGISTER_MODULE_1( "host_urlfilter", 0, 0, URLFilter, HostURLFilter, const std::set<std::string> )
diff --git a/src/modules/urlfilter/protocol/ProtocolURLFilter.cpp b/src/modules/urlfilter/protocol/ProtocolURLFilter.cpp
index 96168b7..98b7ffe 100644
--- a/src/modules/urlfilter/protocol/ProtocolURLFilter.cpp
+++ b/src/modules/urlfilter/protocol/ProtocolURLFilter.cpp
@@ -18,4 +18,4 @@ bool ProtocolURLFilter::filter( const URL url )
return res;
}
-REGISTER_MODULE_1( "protocol_urlfilter", URLFilter, ProtocolURLFilter, const std::set<std::string> )
+REGISTER_MODULE_1( "protocol_urlfilter", 0, 0, URLFilter, ProtocolURLFilter, const std::set<std::string> )
diff --git a/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp b/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
index c8e50a6..ea04980 100755
--- a/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
+++ b/src/modules/urlnormalizer/googleurl/GoogleURLNormalizer.cpp
@@ -106,4 +106,4 @@ URL GoogleURLNormalizer::normalize( const URL url, const string s )
"" );
}
-REGISTER_MODULE( "google_urlnormalizer", URLNormalizer, GoogleURLNormalizer )
+REGISTER_MODULE( "google_urlnormalizer", 0, 0, URLNormalizer, GoogleURLNormalizer )
diff --git a/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp b/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
index b2dd34f..8a7efd7 100755
--- a/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
+++ b/src/modules/urlnormalizer/simpleurl/SimpleURLNormalizer.cpp
@@ -150,4 +150,4 @@ void SimpleURLNormalizer::normalizePath( string &path )
}
}
-REGISTER_MODULE( "simple_urlnormalizer", URLNormalizer, SimpleURLNormalizer )
+REGISTER_MODULE( "simple_urlnormalizer", 0, 0, URLNormalizer, SimpleURLNormalizer )
diff --git a/src/modules/urlseen/memory/MemoryURLSeen.cpp b/src/modules/urlseen/memory/MemoryURLSeen.cpp
index e7bc9e6..055d8d0 100644
--- a/src/modules/urlseen/memory/MemoryURLSeen.cpp
+++ b/src/modules/urlseen/memory/MemoryURLSeen.cpp
@@ -21,4 +21,4 @@ bool MemoryURLSeen::seen( const URL url )
return hasSeen;
}
-REGISTER_MODULE( "memory_urlseen", URLSeen, MemoryURLSeen )
+REGISTER_MODULE( "memory_urlseen", 0, 0, URLSeen, MemoryURLSeen )