made fetcher take a payload, added favicon, turned off statement caching, may turn it back on who knows, added sourceid to topics, added category to topictableviewcell, did a little cleaning

1 files changed, 7 insertions, 9 deletions

diff --git a/Classes/TopicsViewController.h b/Classes/TopicsViewController.h
index 490046d..98a678c 100644
--- a/Classes/TopicsViewController.h
+++ b/Classes/TopicsViewController.h
@@ -7,7 +7,6 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "XMLParser.h"
 #import "HJObjManager.h"
 //#import "PicDumpViewController.h"
 #import "SourcesEditViewController.h"
@@ -15,32 +14,31 @@
 #import "FMDatabase.h"
 #import "SectionDictionary.h"
 #import "Fetcher.h"
+#import "Source.h"
 
-@interface TopicsViewController : UIViewController <FetcherDelegate, XMLParserDelegate, SourcesEditViewControllerDelegate, UITableViewDataSource>{
+@interface TopicsViewController : UIViewController <FetcherDelegate, SourcesEditViewControllerDelegate, UITableViewDataSource>{
     UINavigationController *topicsNavigationController;
-    NSMutableArray *topics; // topics loaded from the web
+	NSMutableDictionary *sourcesDictionary;
 
 	SectionDictionary *tableDictionary; // structure to sync with table
 	PhotoViewController *photoViewController;
-    XMLParser *parser;
+
 	HJObjManager* objMan;
+	
 	FMDatabase* db;
 }
 
 - (IBAction)showSources:(id)sender;
 
+@property (nonatomic, retain) NSMutableDictionary *sourcesDictionary;
 @property (nonatomic, retain) IBOutlet UITableView *tableView;
 @property (nonatomic, retain, readonly) UINavigationController *topicsNavigationController;
 @property (nonatomic, retain) PhotoViewController *photoViewController;
-@property (nonatomic, retain) NSMutableArray *topics;
-//@property (nonatomic, retain, readonly) PicDumpViewController *picDumpViewController;
-@property (nonatomic, retain) XMLParser *parser;
 
-// Called by the ParserChoiceViewController based on the selected parser type.
-- (void)startParsing;
 - (void)getTopicsFromDb;
 - (void)addTopicToSectionDictionary:(Topic *)topic;
 - (void)loadSubscribedTopics;
 - (void)addTopicsFromJson:(NSData *)topics;
+- (void)addTopicsFromJson:(NSData *)data forSource:(Source *)source;
 
 @end