Revision: 29417
http://sourceforge.net/p/bibdesk/svn/29417
Author: hofman
Date: 2025-08-05 15:31:45 +0000 (Tue, 05 Aug 2025)
Log Message:
-----------
Use AndReturnError: instead of ReturninErrror: as method name tail as this
seems to be the standard, at least as translated from swift throwing methods
Modified Paths:
--------------
trunk/bibdesk/BDSKACLParser.m
trunk/bibdesk/BDSKACMDLParser.m
trunk/bibdesk/BDSKArxivParser.m
trunk/bibdesk/BDSKAsynchronousWebParser.h
trunk/bibdesk/BDSKAsynchronousWebParser.m
trunk/bibdesk/BDSKBibTeXWebParser.m
trunk/bibdesk/BDSKCOinSParser.m
trunk/bibdesk/BDSKDOIWebParser.m
trunk/bibdesk/BDSKHCiteParser.m
trunk/bibdesk/BDSKHubmedParser.m
trunk/bibdesk/BDSKIACRParser.m
trunk/bibdesk/BDSKIEEEXploreParser.m
trunk/bibdesk/BDSKISIGroupServer.m
trunk/bibdesk/BDSKInspireParser.m
trunk/bibdesk/BDSKJSTORWebParser.m
trunk/bibdesk/BDSKMathSciNetParser.m
trunk/bibdesk/BDSKNumdamParser.m
trunk/bibdesk/BDSKProjectEuclidParser.m
trunk/bibdesk/BDSKSpringerParser.m
trunk/bibdesk/BDSKWebParser.h
trunk/bibdesk/BDSKWebParser.m
trunk/bibdesk/BDSKZentralblattParser.m
Modified: trunk/bibdesk/BDSKACLParser.m
===================================================================
--- trunk/bibdesk/BDSKACLParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKACLParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -76,9 +76,9 @@
}
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
if ([[[self URL] path] hasCaseInsensitivePrefix:@"/anthology/events/"])
- return [super itemsReturningError:outError];
+ return [super itemsAndReturnError:outError];
DOMNode *node = [[[self domDocument] documentElement]
singleNodeForXPath:BIBTEX_NODE_XPATH];
Modified: trunk/bibdesk/BDSKACMDLParser.m
===================================================================
--- trunk/bibdesk/BDSKACMDLParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKACMDLParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -65,7 +65,7 @@
return nil != [self citationURLStringFromNode:node];
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSString *doiNodeXPath = nil;
if ([[self URL] hasFirstPathComponent:@"doi"])
doiNodeXPath = @"./head/meta[@name='dc.Identifier' and
@scheme='doi']/@content";
Modified: trunk/bibdesk/BDSKArxivParser.m
===================================================================
--- trunk/bibdesk/BDSKArxivParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKArxivParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -71,7 +71,7 @@
return node != nil;
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSURL *url = [self URL];
Modified: trunk/bibdesk/BDSKAsynchronousWebParser.h
===================================================================
--- trunk/bibdesk/BDSKAsynchronousWebParser.h 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKAsynchronousWebParser.h 2025-08-05 15:31:45 UTC (rev
29417)
@@ -54,7 +54,7 @@
NSMutableArray *downloads;
}
-// A default implementation of -itemsReturningError: and
+canParseDocument:fromURL:
+// A default implementation of -itemsAndReturnError: and
+canParseDocument:fromURL:
// relies on the implementation of the following subclass specific class
methods:
// An XPath to find a link(s) to bibTeX data, or an identifier that allows
creating a URL
@@ -64,7 +64,7 @@
// By default returns the href attribute of the node
+ (nullable NSString *)citationURLStringFromNode:(DOMNode *)node;
-// Subclasses can also override -itemsReturningError: adding downloads
themselves using the following
+// Subclasses can also override -itemsAndReturnError: adding downloads
themselves using the following
- (void)addDownloadWithRequest:(NSURLRequest *)request contextInfo:(nullable
id)contextInfo;
// Main method to get items from the downloaded citations
Modified: trunk/bibdesk/BDSKAsynchronousWebParser.m
===================================================================
--- trunk/bibdesk/BDSKAsynchronousWebParser.m 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKAsynchronousWebParser.m 2025-08-05 15:31:45 UTC (rev
29417)
@@ -72,7 +72,7 @@
return nil != [self citationURLStringFromNode:node];
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSString *bibtexNodePath = [[self class] citationNodeXPath];
NSArray *bibtexNodes = [[[self domDocument] documentElement]
nodesForXPath:bibtexNodePath];
Modified: trunk/bibdesk/BDSKBibTeXWebParser.m
===================================================================
--- trunk/bibdesk/BDSKBibTeXWebParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKBibTeXWebParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -54,7 +54,7 @@
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSMutableArray *items = [NSMutableArray array];
Modified: trunk/bibdesk/BDSKCOinSParser.m
===================================================================
--- trunk/bibdesk/BDSKCOinSParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKCOinSParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -317,7 +317,7 @@
}
// Process the document.
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSArray *nodes = [[[self domDocument] documentElement]
nodesForXPath:hasCOinSNodesXPath];
Modified: trunk/bibdesk/BDSKDOIWebParser.m
===================================================================
--- trunk/bibdesk/BDSKDOIWebParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKDOIWebParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -62,7 +62,7 @@
return nil != [doiRegex findInString:text];
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSMutableArray *dois = [NSMutableArray array];
NSURL *baseURL = [NSURL URLWithString:@"https://doi.org/";];
DOMNode *rootElement = [[self domDocument] documentElement];
Modified: trunk/bibdesk/BDSKHCiteParser.m
===================================================================
--- trunk/bibdesk/BDSKHCiteParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKHCiteParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -63,7 +63,7 @@
return mainNode != nil;
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSMutableArray *items = [NSMutableArray arrayWithCapacity:0];
Modified: trunk/bibdesk/BDSKHubmedParser.m
===================================================================
--- trunk/bibdesk/BDSKHubmedParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKHubmedParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -55,7 +55,7 @@
return nil != [regex findInString:[url query]];
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
// query is 'uids=<somenumber>':
// NSString *uidString = [[url query] substringWithRange:NSMakeRange(5,
[[url query] length] - 5)];
Modified: trunk/bibdesk/BDSKIACRParser.m
===================================================================
--- trunk/bibdesk/BDSKIACRParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKIACRParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -71,7 +71,7 @@
+ (NSString *)citationNodeXPath { return @"./body//a[@class='paperlink']"; }
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSURL *url = [self URL];
DOMElement *rootElement = [[self domDocument] documentElement];
AGRegex *yrnRegex = [AGRegex regexWithPattern:@"^/([0-9]{4})/([0-9]+)$"];
Modified: trunk/bibdesk/BDSKIEEEXploreParser.m
===================================================================
--- trunk/bibdesk/BDSKIEEEXploreParser.m 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKIEEEXploreParser.m 2025-08-05 15:31:45 UTC (rev
29417)
@@ -62,7 +62,7 @@
return [[domDocument documentElement]
singleNodeForXPath:containsAbstractPlusLinkNode] != nil;
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
/*
Modified: trunk/bibdesk/BDSKISIGroupServer.m
===================================================================
--- trunk/bibdesk/BDSKISIGroupServer.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKISIGroupServer.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -97,7 +97,7 @@
- (void)searchWithAuthentication;
- (void)search;
- (void)closeSession;
-- (BDSKSoapElement *)newRequestReturningError:(NSString **)errorString;
+- (BDSKSoapElement *)newRequestAndReturnError:(NSString **)errorString;
- (BibItem *)newItemFromInfo:(NSDictionary *)pubInfo;
@@ -266,7 +266,7 @@
NSString *errorString = nil;
if (request == nil)
- request = [self newRequestReturningError:&errorString];
+ request = [self newRequestAndReturnError:&errorString];
if (request == nil) {
@@ -396,7 +396,7 @@
}
-- (BDSKSoapElement *)newRequestReturningError:(NSString **)errorString {
+- (BDSKSoapElement *)newRequestAndReturnError:(NSString **)errorString {
NSString *query = [self searchTerm];
static NSString *operator[5] = {@"", @"citedby:", @"citing:", @"related:",
@"uid:"};
Modified: trunk/bibdesk/BDSKInspireParser.m
===================================================================
--- trunk/bibdesk/BDSKInspireParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKInspireParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -56,7 +56,7 @@
return [[[url host] lowercaseString] isEqualToString:@"inspirehep.net"];
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
NSMutableString *downloadURLString = [[[self URL] absoluteString]
mutableCopy];
NSUInteger idx = [downloadURLString rangeOfString:@"/literature"].location;
Modified: trunk/bibdesk/BDSKJSTORWebParser.m
===================================================================
--- trunk/bibdesk/BDSKJSTORWebParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKJSTORWebParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -55,7 +55,7 @@
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
// extract JSTOR article number
AGRegex *jstorRegex = [AGRegex regexWithPattern:@"^/stable/([0-9]+)"];
Modified: trunk/bibdesk/BDSKMathSciNetParser.m
===================================================================
--- trunk/bibdesk/BDSKMathSciNetParser.m 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKMathSciNetParser.m 2025-08-05 15:31:45 UTC (rev
29417)
@@ -62,7 +62,7 @@
// Finds strings of type MR1234567 in the current page.
// Creates a list of their IDs (without leading zeroes), and retrieves the
BibItems for them.
// Returns an array with those BibItems.
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
AGRegex * MRRegexp = [AGRegex regexWithPattern:@"MR0*([0-9]+)"
options:AGRegexMultiline];
NSArray * regexpResults = [MRRegexp findAllInString:[[[self
domDocument] documentElement] innerHTML]];
Modified: trunk/bibdesk/BDSKNumdamParser.m
===================================================================
--- trunk/bibdesk/BDSKNumdamParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKNumdamParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -60,7 +60,7 @@
// Find references from Zentralblatt Math referred to by the page. Then look
them up. Insert link to NUMDAM in the item's own record.
// (Support for MatSciNet is currently commented out as their lookup script
requires online-style MR1234567 identifiers and NUMDAM uses paper-style
identifiers a la 16,957b.)
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
DOMNode * tableCell = [[[self domDocument] documentElement]
singleNodeForXPath:@".//td[@id='contenu']"];
NSString * content = [tableCell textContent];
Modified: trunk/bibdesk/BDSKProjectEuclidParser.m
===================================================================
--- trunk/bibdesk/BDSKProjectEuclidParser.m 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKProjectEuclidParser.m 2025-08-05 15:31:45 UTC (rev
29417)
@@ -59,7 +59,7 @@
}
// Find references for Mathematical Reviews and Zentralblatt Math in the page.
Then look them up, giving preference to MSN if both are available.
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
DOMNode * identifier = [[[self domDocument] documentElement]
singleNodeForXPath:@".//div[@id='identifier']/p"];
Modified: trunk/bibdesk/BDSKSpringerParser.m
===================================================================
--- trunk/bibdesk/BDSKSpringerParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKSpringerParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -71,7 +71,7 @@
return node != nil;
}
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
BOOL isArticle = [[self URL] hasFirstPathComponent:@"article"];
NSString *bibtexNodePath = nil;
if (isArticle)
Modified: trunk/bibdesk/BDSKWebParser.h
===================================================================
--- trunk/bibdesk/BDSKWebParser.h 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKWebParser.h 2025-08-05 15:31:45 UTC (rev 29417)
@@ -93,7 +93,7 @@
+ (BOOL)shouldMonitorURL:(NSURL *)url;
// main method for subclasses to implement
-- (nullable NSArray *)itemsReturningError:(NSError **)outError;
+- (nullable NSArray *)itemsAndReturnError:(NSError **)outError;
// information for the parser, to be implemented by the subclasses
@property (class, nonatomic, readonly) NSString *name;
Modified: trunk/bibdesk/BDSKWebParser.m
===================================================================
--- trunk/bibdesk/BDSKWebParser.m 2025-08-05 14:40:40 UTC (rev 29416)
+++ trunk/bibdesk/BDSKWebParser.m 2025-08-05 15:31:45 UTC (rev 29417)
@@ -185,7 +185,7 @@
NSError *error = nil;
- NSArray *items = [self itemsReturningError:&error];
+ NSArray *items = [self itemsAndReturnError:&error];
if ([items count] > 0)
[[self delegate] webParser:self didFindItems:items];
@@ -215,7 +215,7 @@
return [self finishedStarting];
}
-- (NSArray *)itemsReturningError:(NSError **)outError { return nil; }
+- (NSArray *)itemsAndReturnError:(NSError **)outError { return nil; }
+ (BOOL)canParseDocument:(DOMDocument *)domDocument fromURL:(NSURL *)url {
return NO; }
Modified: trunk/bibdesk/BDSKZentralblattParser.m
===================================================================
--- trunk/bibdesk/BDSKZentralblattParser.m 2025-08-05 14:40:40 UTC (rev
29416)
+++ trunk/bibdesk/BDSKZentralblattParser.m 2025-08-05 15:31:45 UTC (rev
29417)
@@ -62,7 +62,7 @@
// Find occurrences of strings Zbl [pre]1234.56789 or JFM 12.3456.78 on the
page.
// Extract their IDs and look them up.
// Return the resulting BibItems.
-- (NSArray *)itemsReturningError:(NSError **)outError {
+- (NSArray *)itemsAndReturnError:(NSError **)outError {
AGRegex *ZMathRegexp = [AGRegex regexWithPattern:@"(Zbl|JFM)
(pre)?([0-9.]*)" options:AGRegexMultiline];
NSArray * regexpResults = [ZMathRegexp findAllInString:[[[self
domDocument] documentElement] innerHTML]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
