All new fangled iterators, views, row engines, exceptions, the list goes on

Includes site and console updates to match

1 files changed, 10 insertions, 16 deletions

diff --git a/project2/urlRows.h b/project2/urlRows.h
index 5ee7597..08acffc 100644
--- a/project2/urlRows.h
+++ b/project2/urlRows.h
@@ -5,22 +5,21 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <map>
-#include "view.h"
-#include "iterate.h"
+#include "perRowValues.h"
 
 class _UrlRows : public PerRowValues {
 	public:
 		_UrlRows(const xmlpp::Element * p);
 		~_UrlRows();
 
-		virtual void loadComplete();
-		void execute() const;
+		virtual void loadComplete(const CommonObjects *);
+		void execute(const RowProcessor *) const;
+		virtual void setFilter(const Glib::ustring &);
 		unsigned int columnCount() const;
 		const Glib::ustring & getColumnName(unsigned int col) const;
 		const Glib::ustring & getCurrentValue(const Glib::ustring & id) const;
 		const Glib::ustring & getCurrentValue(unsigned int col) const;
 		bool isNull(unsigned int col) const;
-		virtual void rowReady() const = 0;
 
 		typedef std::set<gunichar> CharSet;
 		const Glib::ustring url;
@@ -32,8 +31,13 @@ class _UrlRows : public PerRowValues {
 		mutable Values values;
 
 	private:
+		struct callback {
+			callback(const _UrlRows * urlRows, const RowProcessor * rp);
+			const _UrlRows * urlRows;
+			const RowProcessor * rp;
+		};
 		static size_t _handleData(const char * ptr, size_t size, size_t nmemb, void * stream);
-		size_t handleData(const char * bytes, size_t bytesLen) const;
+		size_t handleData(const RowProcessor * rp, const char * bytes, size_t bytesLen) const;
 		gunichar fieldSep;
 		gunichar quoteChar;
 		gunichar newline;
@@ -50,15 +54,5 @@ class _UrlRows : public PerRowValues {
 };
 typedef boost::intrusive_ptr<_UrlRows> UrlRows;
 
-typedef _GenericView<_UrlRows> _UrlView;
-typedef boost::intrusive_ptr<_UrlView> UrlView;
-typedef std::map<std::string, UrlView> UrlViews;
-
-typedef _GenericIterate<_UrlRows> _UrlIterate;
-typedef boost::intrusive_ptr<_UrlIterate> UrlIterate;
-typedef std::map<std::string, UrlIterate> UrlIterates;
-
 #endif
 
-
-