diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | googleurl/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/GoogleURLNormalizer.cpp | 2 | ||||
| -rw-r--r-- | src/GoogleURLNormalizer.hpp | 9 | ||||
| -rw-r--r-- | tests/googleurl/GNUmakefile | 4 |
5 files changed, 4 insertions, 16 deletions
diff --git a/GNUmakefile b/GNUmakefile index ab6185d..bbe2e17 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ TOPDIR = . -SUBDIRS = libfetch streamhtmlparser googleurl src tests +SUBDIRS = libfetch streamhtmlparser googleurl sqlite3 src tests PACKAGE_NAME = CrawlingWolf PACKAGE_VERSION = 0.0.1 diff --git a/googleurl/GNUmakefile b/googleurl/GNUmakefile index b73d9da..88da0c5 100644 --- a/googleurl/GNUmakefile +++ b/googleurl/GNUmakefile @@ -31,8 +31,7 @@ CPP_OBJS = \ url_canon_stdurl.o \ url_parse.o \ url_parse_file.o \ - url_util.o \ - gurl.o + url_util.o STATIC_LIB = \ libgoogleurl.a diff --git a/src/GoogleURLNormalizer.cpp b/src/GoogleURLNormalizer.cpp index 46f1581..023a9e4 100644 --- a/src/GoogleURLNormalizer.cpp +++ b/src/GoogleURLNormalizer.cpp @@ -21,7 +21,7 @@ GoogleURLNormalizer::~GoogleURLNormalizer( ) Shutdown( ); } -string GoogleURLNormalizer::componentString( const string &s, const Component &comp ) const +static string componentString( const string &s, const Component &comp ) { if( comp.len <= 0 ) { return string( ); diff --git a/src/GoogleURLNormalizer.hpp b/src/GoogleURLNormalizer.hpp index d630d5f..1aa33bf 100644 --- a/src/GoogleURLNormalizer.hpp +++ b/src/GoogleURLNormalizer.hpp @@ -3,9 +3,6 @@ #include "URLNormalizer.hpp" -//TODO: will fix later, bad include here! -#include "url_parse.h" - class GoogleURLNormalizer : public URLNormalizer { public: GoogleURLNormalizer( ); @@ -15,12 +12,6 @@ class GoogleURLNormalizer : public URLNormalizer { virtual URL parseUrl( const std::string s ); virtual URL normalize( const URL url, const std::string s ); - - private: - //TODO: hide implementation details here (PIMPL) or don't - //allocate Normalizers, use a factory method (as this is - //anyway better for loadable module support!) - std::string componentString( const std::string &s, const url_parse::Component &comp ) const; }; #endif diff --git a/tests/googleurl/GNUmakefile b/tests/googleurl/GNUmakefile index 3f685d8..be8c4f0 100644 --- a/tests/googleurl/GNUmakefile +++ b/tests/googleurl/GNUmakefile @@ -2,10 +2,8 @@ TOPDIR = ../.. SUBDIRS = -#TODO: hide include dependency on googleurl here! INCLUDE_DIRS = \ - -I$(TOPDIR)/src \ - -I$(TOPDIR)/googleurl + -I$(TOPDIR)/src INCLUDE_LDFLAGS = |