Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 411612 - Bugzilla OpenSearch produces Bugzilla error page in Camino (add support for the 'param' element used in old versions of the OpenSearch spec). patch by Sean Murphy <murph@seanmurph.com>, r=Jeff.Dlouhy, sr=smorgan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alqahira%ardisson.org
2008-01-11 18:54:06 +00:00
parent 0b84e0f698
commit 78a9e4a5ab
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/camino/src/websearch/OpenSearchParser.mm
View File

@@ -42,6 +42,7 @@
// XML element names we're interested in.
static NSString *const kSearchEngineNameElement = @"ShortName";
static NSString *const kSearchEngineURLElement = @"Url";
static NSString *const kSearchEngineURLParameterElement = @"Param";
// Template URL parameters
static NSString *const kSearchTermsURLParameter = @"searchTerms";
@@ -72,7 +73,9 @@ static NSString *const kDefaultLanguage = @"*"; // '*' is defined in OS spec to
{
if ((self = [super init])) {
[self setShouldParseContentsOfElements:[NSSet setWithObject:kSearchEngineNameElement]];
[self setShouldParseAttributesOfElements:[NSSet setWithObject:kSearchEngineURLElement]];
[self setShouldParseAttributesOfElements:[NSSet setWithObjects:kSearchEngineURLElement,
kSearchEngineURLParameterElement,
nil]];
mURLParametersAndKnownValues = [[NSDictionary alloc] initWithObjectsAndKeys:
kSearchTermsToken, kSearchTermsURLParameter,
@@ -118,6 +121,26 @@ static NSString *const kDefaultLanguage = @"*"; // '*' is defined in OS spec to
[self setSearchEngineURL:searchURLTemplate];
}
}
else if ([elementName isEqualToString:kSearchEngineURLParameterElement]) {
// Older drafts of the OpenSearch spec allow "<Param>" elements inside "<Url>". When used, only
// a base search URL template is specified, requiring us to manually append each query parameter.
NSMutableString *searchURL = [NSMutableString stringWithString:[self searchEngineURL]];
if (!searchURL)
return;
NSString *paramName = [attributeDict objectForKey:@"name"];
NSString *paramValue = [attributeDict objectForKey:@"value"];
// Append the query param differently depending if it's the first one or not.
NSRange queryStartRange = [searchURL rangeOfString:@"?"];
if (queryStartRange.location == NSNotFound)
[searchURL appendFormat:@"?%@=%@", paramName, paramValue];
else
[searchURL appendFormat:@"&%@=%@", paramName, paramValue];
[self insertValuesForParametersInURLTemplate:searchURL];
[self setSearchEngineURL:searchURL];
}
}
- (void)foundContents:(NSString *)stringContents forElement:(NSString *)elementName