Revision: 29425
http://sourceforge.net/p/bibdesk/svn/29425
Author: hofman
Date: 2025-08-12 16:13:20 +0000 (Tue, 12 Aug 2025)
Log Message:
-----------
rename property to more easily distinguish it from similarly named properties
Modified Paths:
--------------
trunk/bibdesk/BDSKACLParser.m
trunk/bibdesk/BDSKACMDLParser.m
trunk/bibdesk/BDSKArxivParser.m
trunk/bibdesk/BDSKHCiteParser.m
trunk/bibdesk/BDSKIACRParser.m
trunk/bibdesk/BDSKProjectEuclidParser.m
trunk/bibdesk/BDSKWebView.m
trunk/bibdesk/DOMNode_BDSKExtensions.h
trunk/bibdesk/DOMNode_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKACLParser.m
===================================================================
--- trunk/bibdesk/BDSKACLParser.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKACLParser.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -85,7 +85,7 @@
if (node == nil)
return nil;
- NSString *bibtexString = [node stringValue];
+ NSString *bibtexString = [node textString];
NSArray *bibtexItems = [self itemsFromBibTeXString:bibtexString
error:outError];
[self addPDFURLsToItems:bibtexItems];
Modified: trunk/bibdesk/BDSKACMDLParser.m
===================================================================
--- trunk/bibdesk/BDSKACMDLParser.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKACMDLParser.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -76,7 +76,7 @@
NSMutableSet *dois = [NSMutableSet set];
for (DOMNode *doiNode in doiNodes) {
- NSString *doi = [doiNode stringValue];
+ NSString *doi = [doiNode textString];
if ([dois containsObject:doi]) continue;
[dois addObject:doi];
Modified: trunk/bibdesk/BDSKArxivParser.m
===================================================================
--- trunk/bibdesk/BDSKArxivParser.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKArxivParser.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -178,7 +178,7 @@
// search for arXiv ID
node = [arxivLinkNode singleNodeForXPathExpression:arxivIDNodePath];
if (node) {
- if ((string = [node stringValue])) {
+ if ((string = [node textString])) {
if ([string hasCaseInsensitivePrefix:@"arXiv:"])
string = [string substringFromIndex:6];
[pubFields setValue:string forKey:@"Eprint"];
@@ -212,7 +212,7 @@
node = [arxivLinkNode singleNodeForXPathExpression:doiNodePath];
if (node) {
// successfully found the result DOI
- if ((string = [node stringValue])) {
+ if ((string = [node textString])) {
[pubFields setValue:string forKey:BDSKDoiString];
if ([BDSKDoiString isRemoteURLField]) {
if ([string containsString:@"://"] == NO)
@@ -233,7 +233,7 @@
// search for authors
nodes = [arxivMetaNode nodesForXPathExpression:authorsNodePath];
if (0 < [nodes count]) {
- if ((string = [[nodes valueForKeyPath:@"stringValue"]
componentsJoinedByString:@" and "])) {
+ if ((string = [[nodes valueForKeyPath:@"textString"]
componentsJoinedByString:@" and "])) {
[pubFields setValue:string forKey:BDSKAuthorString];
}
}
@@ -241,7 +241,7 @@
// search for journal ref
node = [arxivMetaNode singleNodeForXPathExpression:journalNodePath];
if (node) {
- if ((string = [node stringValue])) {
+ if ((string = [node textString])) {
// try to get full journal ref components, as "Journal Volume
(Year) Pages"
AGRegexMatch *match = [journalRegex1 findInString:string];
if ([match groupAtIndex:0]) {
Modified: trunk/bibdesk/BDSKHCiteParser.m
===================================================================
--- trunk/bibdesk/BDSKHCiteParser.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKHCiteParser.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -134,7 +134,7 @@
// note: todo - avoid second hasParentWithClassName by finding
container
// nodes first and caching those then checking against them here. (if
necessary)
if(isContainer || [self nodeHasContainerParent:node] == NO)
- [rd setObject:[node stringValue] forKey:BDSKTitleString];
+ [rd setObject:[node textString] forKey:BDSKTitleString];
}
// find authors
@@ -150,7 +150,7 @@
nodes = [citationNode nodesForXPathExpression:[xpaths
objectForKey:@"tag"]];
- [rd setObject:[[nodes valueForKey:@"stringValue"]
componentsJoinedByString:@"; "] forKey:BDSKKeywordsString];
+ [rd setObject:[[nodes valueForKey:@"textString"]
componentsJoinedByString:@"; "] forKey:BDSKKeywordsString];
// find description (append multiple descriptions to avoid data loss)
@@ -158,7 +158,7 @@
[array addObjectsFromArray:[citationNode nodesForXPathExpression:[xpaths
objectForKey:@"description"]]];
[array addObjectsFromArray:[citationNode nodesForXPathExpression:[xpaths
objectForKey:@"abstract"]]];
- [rd setObject:[[array valueForKey:@"stringValue"]
componentsJoinedByString:@"\n"] forKey:BDSKAbstractString];
+ [rd setObject:[[array valueForKey:@"textString"]
componentsJoinedByString:@"\n"] forKey:BDSKAbstractString];
// find date published
@@ -181,7 +181,7 @@
node = [citationNode singleNodeForXPathExpression:[xpaths
objectForKey:@"issue"]];
if(node) {
- [rd setObject:[node stringValue] forKey:@"Issue"];
+ [rd setObject:[node textString] forKey:@"Issue"];
}
// find pages
@@ -190,7 +190,7 @@
node = [citationNode singleNodeForXPathExpression:[xpaths
objectForKey:@"pages"]];
if(node) {
- [rd setObject:[node stringValue] forKey:BDSKPagesString];
+ [rd setObject:[node textString] forKey:BDSKPagesString];
}
// find URI
@@ -287,7 +287,7 @@
if (title)
return title;
}
- return [node stringValue];
+ return [node textString];
}
- (NSDate *)dateFromNode:(DOMNode *)node{
Modified: trunk/bibdesk/BDSKIACRParser.m
===================================================================
--- trunk/bibdesk/BDSKIACRParser.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKIACRParser.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -83,7 +83,7 @@
DOMNode *bibtexNode = [rootElement
singleNodeForXPath:@"./body//pre[@id='bibtex']"];
if (bibtexNode) {
- NSString *bibtexString = [bibtexNode stringValue];
+ NSString *bibtexString = [bibtexNode textString];
BibItem *item = [[self itemsFromBibTeXString:bibtexString
error:outError] firstObject];
if (item) {
Modified: trunk/bibdesk/BDSKProjectEuclidParser.m
===================================================================
--- trunk/bibdesk/BDSKProjectEuclidParser.m 2025-08-11 21:14:26 UTC (rev
29424)
+++ trunk/bibdesk/BDSKProjectEuclidParser.m 2025-08-12 16:13:20 UTC (rev
29425)
@@ -68,7 +68,7 @@
if ( identifier ) {
- NSString * identifierString = [identifier stringValue];
+ NSString * identifierString = [identifier textString];
AGRegex * MRRegexp = [AGRegex regexWithPattern:@"MR([1-9][0-9]*)"
options:0];
AGRegex * ZMathRegexp = [AGRegex regexWithPattern:@"Zentralblatt.*
([0-9.]+)" options:0];
@@ -91,7 +91,7 @@
NSMutableArray * ZMathIDs = [NSMutableArray
arrayWithObjects:myZMathID, nil];
for (DOMElement * reference in references) {
- NSString * referenceString = [reference stringValue];
+ NSString * referenceString = [reference textString];
match = [MRRegexp findInString:referenceString];
NSString * referenceID = [[match string] substringWithRange:[match
rangeAtIndex:1]];
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-08-11 21:14:26 UTC (rev 29424)
+++ trunk/bibdesk/BDSKWebView.m 2025-08-12 16:13:20 UTC (rev 29425)
@@ -436,7 +436,7 @@
if (frame == [sender mainFrame]) {
NSString *title = [sender mainFrameTitle];
if ([NSString isEmptyString:title]) {
- title = [[[[frame DOMDocument] nodesForXPath:@"/html/head/title"]
firstObject] stringValue];
+ title = [[[[frame DOMDocument] nodesForXPath:@"/html/head/title"]
firstObject] textString];
if ([NSString isEmptyString:title]) {
NSURL *url = [[[frame dataSource] request] URL];
if ([url isFileURL]) {
Modified: trunk/bibdesk/DOMNode_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/DOMNode_BDSKExtensions.h 2025-08-11 21:14:26 UTC (rev
29424)
+++ trunk/bibdesk/DOMNode_BDSKExtensions.h 2025-08-12 16:13:20 UTC (rev
29425)
@@ -48,7 +48,7 @@
- (nullable NSArray *)nodesForXPathExpression:(DOMXPathExpression
*)xpathExpression;
- (nullable DOMNode *)singleNodeForXPathExpression:(DOMXPathExpression
*)xpathExpression;
-@property (nonatomic, nullable, readonly) NSString *stringValue;
+@property (nonatomic, nullable, readonly) NSString *textString;
@property (nonatomic, nullable, readonly) NSString
*stringValuePreservingMathJax;
- (nullable NSString *)stringValueOfAttribute:(NSString *)attrName;
Modified: trunk/bibdesk/DOMNode_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/DOMNode_BDSKExtensions.m 2025-08-11 21:14:26 UTC (rev
29424)
+++ trunk/bibdesk/DOMNode_BDSKExtensions.m 2025-08-12 16:13:20 UTC (rev
29425)
@@ -82,7 +82,7 @@
}
// DOM keeps all spaces and newlines as in the html, rather than as they are
interpreted
-- (NSString *)stringValue {
+- (NSString *)textString {
return [[self textContent]
stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines]
?: @"";
}
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
