Revision: 21916
http://sourceforge.net/p/bibdesk/svn/21916
Author: hofman
Date: 2018-02-13 15:40:25 +0000 (Tue, 13 Feb 2018)
Log Message:
-----------
rename variables
Modified Paths:
--------------
trunk/bibdesk/BDSKLinkedBibTeXParser.m
Modified: trunk/bibdesk/BDSKLinkedBibTeXParser.m
===================================================================
--- trunk/bibdesk/BDSKLinkedBibTeXParser.m 2018-02-13 15:33:38 UTC (rev
21915)
+++ trunk/bibdesk/BDSKLinkedBibTeXParser.m 2018-02-13 15:40:25 UTC (rev
21916)
@@ -72,16 +72,16 @@
NSString *bibtexNodePath = [self linkedBibTeXNodeXPath];
NSError *error = nil;
- NSArray *searchResults = [[xmlDocument rootElement]
nodesForXPath:bibtexNodePath error:&error];
+ NSArray *bibtexNodes = [[xmlDocument rootElement]
nodesForXPath:bibtexNodePath error:&error];
// bail out with an XML error if the Xpath query fails
- if (nil == searchResults) {
+ if (nil == bibtexNodes) {
if (outError) *outError = error;
return nil;
}
// check the number of nodes first
- if (0 == [searchResults count]) {
+ if (0 == [bibtexNodes count]) {
error = [NSError mutableLocalErrorWithCode:kBDSKWebParserFailed
localizedDescription:NSLocalizedString(@"No search results found", @"Web parser
error")];
[error setValue:NSLocalizedString(@"Unable to parse this page. Please
report this to BibDesk's developers and provide the URL.", @"Web parser error")
forKey:NSLocalizedRecoverySuggestionErrorKey];
if (outError) *outError = error;
@@ -88,20 +88,20 @@
return nil;
}
- for (NSXMLNode *searchResult in searchResults) {
+ for (NSXMLNode *bibtexNode in bibtexNodes) {
NSArray *bibtexItems = nil;
- NSString *bibTeXString = nil;
- NSURL *btURL = nil;
- NSString *btURLString = [self
linkedBibTeXURLStringFromNode:searchResult];
+ NSString *bibtexString = nil;
+ NSURL *bibtexURL = nil;
+ NSString *bibtexURLString = [self
linkedBibTeXURLStringFromNode:bibtexNode];
- if (btURLString == nil) {
- bibTeXString = [searchResult stringValue];
+ if (bibtexURLString == nil) {
+ bibtexString = [bibtexNode stringValue];
} else {
- if ([btURLString hasPrefix:@"//"]) {
- btURLString = [NSString stringWithFormat:@"%@:%@", [url
scheme], btURLString];
- } else if ([btURLString hasPrefix:@"/"]) {
- btURLString = [NSString stringWithFormat:@"%@://%@%@", [url
scheme], [url host], btURLString];
- } else if ([btURLString containsString:@"://"] == NO) {
+ if ([bibtexURLString hasPrefix:@"//"]) {
+ bibtexURLString = [NSString stringWithFormat:@"%@:%@", [url
scheme], bibtexURLString];
+ } else if ([bibtexURLString hasPrefix:@"/"]) {
+ bibtexURLString = [NSString stringWithFormat:@"%@://%@%@",
[url scheme], [url host], bibtexURLString];
+ } else if ([bibtexURLString containsString:@"://"] == NO) {
NSString *path = [url path];
if ([path hasSuffix:@"/"] == NO) {
path = [path stringByDeletingLastPathComponent];
@@ -108,17 +108,17 @@
if ([path hasSuffix:@"/"] == NO)
path = [path stringByAppendingString:@"/"];
}
- btURLString = [NSString stringWithFormat:@"%@://%@%@%@", [url
scheme], [url host], [path
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], btURLString];
+ bibtexURLString = [NSString stringWithFormat:@"%@://%@%@%@",
[url scheme], [url host], [path
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding],
bibtexURLString];
}
- btURL = [NSURL URLWithString:btURLString];
+ bibtexURL = [NSURL URLWithString:bibtexURLString];
- NSURLRequest *request = [NSURLRequest requestWithURL:btURL
cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:60.0];
+ NSURLRequest *request = [NSURLRequest requestWithURL:bibtexURL
cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:60.0];
NSURLResponse *response;
- NSData *theData = [NSURLConnection sendSynchronousRequest:request
returningResponse:&response error:&error];
+ NSData *bibtexData = [NSURLConnection
sendSynchronousRequest:request returningResponse:&response error:&error];
- if (nil != theData) {
+ if (nil != bibtexData) {
NSString *encodingName = [response textEncodingName];
NSStringEncoding encoding = kCFStringEncodingInvalidId;
@@ -126,20 +126,20 @@
if (nil != encodingName)
encoding =
CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)encodingName));
if (encoding != kCFStringEncodingInvalidId)
- bibTeXString = [[NSString alloc] initWithData:theData
encoding:encoding];
- if (nil == bibTeXString && encoding != NSUTF8StringEncoding)
- bibTeXString = [[NSString alloc] initWithData:theData
encoding:NSUTF8StringEncoding];
- if (nil == bibTeXString && encoding !=
NSISOLatin1StringEncoding)
- bibTeXString = [[NSString alloc] initWithData:theData
encoding:NSISOLatin1StringEncoding];
+ bibtexString = [[NSString alloc] initWithData:bibtexData
encoding:encoding];
+ if (nil == bibtexString && encoding != NSUTF8StringEncoding)
+ bibtexString = [[NSString alloc] initWithData:bibtexData
encoding:NSUTF8StringEncoding];
+ if (nil == bibtexString && encoding !=
NSISOLatin1StringEncoding)
+ bibtexString = [[NSString alloc] initWithData:bibtexData
encoding:NSISOLatin1StringEncoding];
- [bibTeXString autorelease];
+ [bibtexString autorelease];
}
}
- if (bibTeXString) {
- bibTeXString = [self
linkedBibTeXStringFromReturnedString:bibTeXString];
- if (bibTeXString)
- bibtexItems = [BDSKBibTeXParser itemsFromString:bibTeXString
owner:nil error:&error];
+ if (bibtexString) {
+ bibtexString = [self
linkedBibTeXStringFromReturnedString:bibtexString];
+ if (bibtexString)
+ bibtexItems = [BDSKBibTeXParser itemsFromString:bibtexString
owner:nil error:&error];
}
if ([bibtexItems count] && [error
isLocalErrorWithCode:kBDSKBibTeXParserFailed] == NO) {
@@ -149,7 +149,7 @@
} else {
// display a fake item in the table so the user knows one of the
items failed to parse, but still gets the rest of the data
NSString *errMsg = NSLocalizedString(@"Unable to parse as BibTeX",
@"Web parser error");
- NSDictionary *pubFields = [NSDictionary
dictionaryWithObjectsAndKeys:errMsg, BDSKTitleString, [btURL absoluteString],
BDSKUrlString, nil];
+ NSDictionary *pubFields = [NSDictionary
dictionaryWithObjectsAndKeys:errMsg, BDSKTitleString, [bibtexURL
absoluteString], BDSKUrlString, nil];
BibItem *errorItem = [[BibItem alloc] initWithType:BDSKMiscString
citeKey:nil pubFields:pubFields isNew:YES];
[items addObject:errorItem];
[errorItem release];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
