its been so many weeks I cant remember

IGKArrayController.m

@@ -37,11 +37,14 @@ - (void)fetch:(void (^)(NSArray *managedObjectIDs, BOOL fetchContainsVip))comple
 	NSManagedObjectContext *ctx = [[[NSApp delegate] kitController] managedObjectContext];
 	dispatch_queue_t queue = [[[NSApp delegate] kitController] backgroundQueue];
 
+	if (!queue)
+		return;
+
 	//Copy objects that may change while we're doing this
 	NSPredicate *copiedPredicate = [predicate copy];
 	NSArray *copiedCurrentSortDescriptors = [currentSortDescriptors copy];
 	NSManagedObjectID *vipObjectID = [vipObject objectID];
-		
+
 	dispatch_async(queue, ^{
 
 		NSFetchRequest *request = [[NSFetchRequest alloc] init];

IGKDocRecordManagedObject.m

@@ -408,6 +408,16 @@ - (IGKDocRecordManagedObject *)xcontainer
 	return [self valueForKey:@"misccontainer"];
 }
 
+- (NSString *)xsuperclassname
+{
+	return [self valueForSoftKey:@"superclass"];
+}
+
+- (NSString *)xconforms
+{
+	return @"";
+}
+
 - (NSImage *)normalIcon
 {
 	return [self iconForSelectedState:NO];

IGKHTMLGenerator.m

@@ -172,6 +172,8 @@ - (NSString *)html
 	//Append a footer
 	[self footer];
 
+	NSLog(@"outputString = \n%@", outputString);
+
 	return outputString;
 }
 - (void)html_all

IGKPredicateEditor.h

@@ -0,0 +1,16 @@
+//
+//  IGKPredicateEditor.h
+//  Ingredients
+//
+//  Created by Alex Gordon on 23/03/2010.
+//  Copyright 2010 Fileability. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface IGKPredicateEditor : NSPredicateEditor {
+
+}
+
+@end

IGKPredicateEditor.m

@@ -0,0 +1,57 @@
+//
+//  IGKPredicateEditor.m
+//  Ingredients
+//
+//  Created by Alex Gordon on 23/03/2010.
+//  Copyright 2010 Fileability. All rights reserved.
+//
+
+#import "IGKPredicateEditor.h"
+
+
+@implementation IGKPredicateEditor
+
+- (NSPredicate *)predicate
+{
+	//We want to remove any null comparison predicates from our predicate
+	NSCompoundPredicate *predicate = [super predicate];
+	NSLog(@"Pre = %@", predicate);
+
+	if (!predicate)
+		return nil;
+
+	if ([predicate isKindOfClass:[NSComparisonPredicate class]])
+	{
+		predicate = [[NSCompoundPredicate alloc] initWithType:NSAndPredicateType subpredicates:[NSArray arrayWithObject:predicate]];
+	}
+	else if (![predicate isKindOfClass:[NSCompoundPredicate class]])
+	{
+		return predicate;
+	}
+
+	NSArray *subpredicates = [predicate subpredicates];
+	NSMutableArray *newSubpredicates = [[NSMutableArray alloc] initWithCapacity:[subpredicates count]];
+
+	for (NSComparisonPredicate *cmpP in subpredicates)
+	{
+		NSExpression *right = [cmpP rightExpression];
+		if ([right expressionType] != NSConstantValueExpressionType)
+		{
+			[newSubpredicates addObject:cmpP];
+			continue;
+		}
+
+		id cv = [right constantValue];
+
+		if (cv && (![cv respondsToSelector:@selector(length)] || [cv length] > 0))
+		{
+			[newSubpredicates addObject:cmpP];
+		}
+	}
+
+	NSLog(@"newSubpredicates = %@", newSubpredicates);
+
+	return [[NSCompoundPredicate alloc] initWithType:[predicate compoundPredicateType] subpredicates:newSubpredicates];
+}
+
+@end

IGKScraper.m

@@ -965,10 +965,12 @@ - (void)scrapeMethodChildren:(NSArray *)children index:(NSUInteger)index managed
 			if ([[[ul name] lowercaseString] isEqual:@"ul"])
 			{				
 				for (NSXMLElement *li in [ul children])
-				{					
+				{
 					NSXMLElement *codeElement = [[li children] lastObject];
 					NSXMLElement *a = [[codeElement children] lastObject];
 
+					if (![a isKindOfClass:[NSXMLElement class]])
+						continue;
 					NSString *href = [[a attributeForName:@"href"] commentlessStringValue];
 					NSString *strval = [a commentlessStringValue];
 

IGKWindowController.h

@@ -94,7 +94,9 @@ typedef enum {
 
 	IBOutlet NSView *searchView;
 	IBOutlet NSSearchField *searchViewField;
+	IBOutlet NSScrollView *searchViewPredicateEditorScrollView;
 	IBOutlet NSPredicateEditor *searchViewPredicateEditor;
+	IBOutlet NSScrollView *searchViewTableScrollView;
 	IBOutlet NSTableView *searchViewTable;
 
 	NSPredicate *advancedFilterPredicate;

IGKWindowController.m

@@ -63,6 +63,8 @@ - (id)init
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showSavingProgressSheet:) name:@"IGKWillSaveIndex" object:nil];
 
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(userDefaultsDidChange:) name:NSUserDefaultsDidChangeNotification object:nil];
+
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ruleEditorRowsDidChange:) name:NSRuleEditorRowsDidChangeNotification object:searchViewPredicateEditor];
 	}
 
 	return self;
@@ -591,20 +593,29 @@ - (void)executeAdvancedSearch:(NSString *)query
 {
 	sideSearchQuery = query;
 
+	NSPredicate *predicate = nil;
+	NSMutableArray *subpredicates = [[NSMutableArray alloc] initWithCapacity:2];
+
 	if ([query length] > 0)
 	{
-		NSPredicate *fetchPredicate = nil;
 		if (selectedFilterDocset)
-			fetchPredicate = [NSPredicate predicateWithFormat:@"name CONTAINS[c] %@ && docset == %@", query, selectedFilterDocset];
+			predicate = [NSPredicate predicateWithFormat:@"name CONTAINS[c] %@ && docset == %@", query, selectedFilterDocset];
 		else
-			fetchPredicate = [NSPredicate predicateWithFormat:@"name CONTAINS[c] %@", query];
-
-		[advancedController setPredicate:fetchPredicate];
+			predicate = [NSPredicate predicateWithFormat:@"name CONTAINS[c] %@", query];
 	}
+
+	if ([searchViewPredicateEditor predicate])
+		[subpredicates addObject:[searchViewPredicateEditor predicate]];
+
+	if (predicate)
+		[subpredicates addObject:predicate];
+
+
+	if ([subpredicates count])
+		[advancedController setPredicate:[[NSCompoundPredicate alloc] initWithType:NSAndPredicateType subpredicates:subpredicates]];
 	else
-	{
 		[advancedController setPredicate:[NSPredicate predicateWithValue:NO]];
-	}
+
 
 	[advancedController refresh];
 }
@@ -727,6 +738,33 @@ - (IBAction)changeSelectedFilterDocset:(id)sender
 	[self executeSearch:sideSearchViewField];
 }
 
+- (void)ruleEditorRowsDidChange:(NSNotification *)notification
+{
+	//Work out the new height of the rule editor
+	NSUInteger numRows = [searchViewPredicateEditor numberOfRows];
+	CGFloat height = numRows * [searchViewPredicateEditor rowHeight];
+
+	NSView *superview = [searchViewPredicateEditorScrollView superview];
+	CGFloat superviewHeight = [superview frame].size.height;
+
+	const CGFloat maximumHeight = 200;
+	if (height > maximumHeight)
+		height = maximumHeight;
+
+	NSRect predicateEditorRect = [searchViewPredicateEditorScrollView frame];
+	predicateEditorRect.size.height = height;
+	predicateEditorRect.origin.y = superviewHeight - height;
+
+	NSRect tableRect = [searchViewTableScrollView frame];
+	tableRect.size.height = superviewHeight - height;
+	tableRect.origin.y = 0;
+
+	[searchViewPredicateEditorScrollView setFrame:predicateEditorRect];
+	[searchViewTableScrollView setFrame:tableRect];
+
+	[self executeSearch:searchViewField];
+}
+
 
 #pragma mark -
 #pragma mark Table View Delegate 

Ingredients.xcodeproj/project.pbxproj

@@ -11,6 +11,8 @@
 		0C7C02E7110E000800412666 /* XBNewSourceListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C7C02E5110E000800412666 /* XBNewSourceListCell.m */; };
 		0C7C02ED110E006000412666 /* CHSymbolButtonImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7C02EB110E006000412666 /* CHSymbolButtonImage.h */; };
 		0C7C02EE110E006000412666 /* CHSymbolButtonImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C7C02EC110E006000412666 /* CHSymbolButtonImage.m */; };
+		7507CF4511598197008449DE /* IGKPredicateEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 7507CF4311598197008449DE /* IGKPredicateEditor.h */; };
+		7507CF4611598197008449DE /* IGKPredicateEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 7507CF4411598197008449DE /* IGKPredicateEditor.m */; };
 		750DFBCF114671CC004C5D08 /* IGKMattePopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 750DFBCE114671CC004C5D08 /* IGKMattePopUpButton.m */; };
 		751D2AD21126E4A100403E64 /* IGKArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 751D2AD01126E4A100403E64 /* IGKArrayController.h */; };
 		751D2AD31126E4A100403E64 /* IGKArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 751D2AD11126E4A100403E64 /* IGKArrayController.m */; };
@@ -172,6 +174,8 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		2F7446980DB6B7EA00F9684A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		32CA4F630368D1EE00C91783 /* Ingredients_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ingredients_Prefix.pch; sourceTree = "<group>"; };
+		7507CF4311598197008449DE /* IGKPredicateEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGKPredicateEditor.h; sourceTree = "<group>"; };
+		7507CF4411598197008449DE /* IGKPredicateEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGKPredicateEditor.m; sourceTree = "<group>"; };
 		750DFBCD114671CC004C5D08 /* IGKMattePopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGKMattePopUpButton.h; sourceTree = "<group>"; };
 		750DFBCE114671CC004C5D08 /* IGKMattePopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IGKMattePopUpButton.m; sourceTree = "<group>"; };
 		751D2AD01126E4A100403E64 /* IGKArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IGKArrayController.h; sourceTree = "<group>"; };
@@ -378,6 +382,8 @@
 				75A4B48411429ECD008CA9E8 /* IGKTableOfContentsView.m */,
 				75A9AA9A11495DA300E539F2 /* IGKEaseInOutAnimatedView.h */,
 				75A9AA9B11495DA300E539F2 /* IGKEaseInOutAnimatedView.m */,
+				7507CF4311598197008449DE /* IGKPredicateEditor.h */,
+				7507CF4411598197008449DE /* IGKPredicateEditor.m */,
 			);
 			name = "Views & Cells";
 			sourceTree = "<group>";
@@ -651,6 +657,7 @@
 				75BD177E1143E94000E67594 /* IGKPreferencesController.h in Headers */,
 				75943C0B11441AE0004126E7 /* IGKBackForwardManager.h in Headers */,
 				75A9AA9C11495DA300E539F2 /* IGKEaseInOutAnimatedView.h in Headers */,
+				7507CF4511598197008449DE /* IGKPredicateEditor.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -814,6 +821,7 @@
 				75A4B48611429ECD008CA9E8 /* IGKTableOfContentsView.m in Sources */,
 				75943C0C11441AE0004126E7 /* IGKBackForwardManager.m in Sources */,
 				75A9AA9D11495DA300E539F2 /* IGKEaseInOutAnimatedView.m in Sources */,
+				7507CF4611598197008449DE /* IGKPredicateEditor.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};