Revision: 25180
http://sourceforge.net/p/bibdesk/svn/25180
Author: hofman
Date: 2020-12-11 15:32:57 +0000 (Fri, 11 Dec 2020)
Log Message:
-----------
Probably not a good idea to get container from stringValueOfField as it affects
other features that use this
Modified Paths:
--------------
trunk/bibdesk/BDSKFormatParser.h
trunk/bibdesk/BDSKFormatParser.m
trunk/bibdesk/BDSKPreviewItem.m
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BDSKFormatParser.h
===================================================================
--- trunk/bibdesk/BDSKFormatParser.h 2020-12-11 14:44:20 UTC (rev 25179)
+++ trunk/bibdesk/BDSKFormatParser.h 2020-12-11 15:32:57 UTC (rev 25180)
@@ -42,6 +42,7 @@
@protocol BDSKParseableItem <NSObject>
- (NSString *)citeKey;
- (NSString *)title;
+- (NSString *)container;
- (NSString *)stringValueOfField:(NSString *)field;
- (NSInteger)integerValueOfField:(NSString *)field;
- (NSArray *)peopleArrayForField:(NSString *)field;
Modified: trunk/bibdesk/BDSKFormatParser.m
===================================================================
--- trunk/bibdesk/BDSKFormatParser.m 2020-12-11 14:44:20 UTC (rev 25179)
+++ trunk/bibdesk/BDSKFormatParser.m 2020-12-11 15:32:57 UTC (rev 25180)
@@ -515,10 +515,12 @@
scanOptArg(scanner, &slash,
NULL);
if (NO == [scanner
scanUnsignedInteger:&numChars]) numChars = 0;
- if (NO == [fieldName
isEqualToString:BDSKCiteKeyString] &&
- [key
isEqualToString:BDSKCiteKeyString]) {
- value = [pub citeKey];
- } else {
+ if (NO == [fieldName
isEqualToString:BDSKCiteKeyString] &&
+ [key isEqualToString:BDSKCiteKeyString]) {
+ value = [pub citeKey];
+ } else if (NO == [fieldName
isEqualToString:BDSKContainerString]) {
+ value = [pub container];
+ } else {
value = [pub
stringValueOfField:key];
}
if ([NSString
isEmptyString:value] == NO) {
Modified: trunk/bibdesk/BDSKPreviewItem.m
===================================================================
--- trunk/bibdesk/BDSKPreviewItem.m 2020-12-11 14:44:20 UTC (rev 25179)
+++ trunk/bibdesk/BDSKPreviewItem.m 2020-12-11 15:32:57 UTC (rev 25180)
@@ -73,7 +73,7 @@
NSLocalizedString(@"BibDesk, a great application to
manage your bibliographies", @"Title for preview item in preferences"),
BDSKTitleString,
@"McCracken, M. and Maxwell, A. and Hofman, C. M. and
Porst, S. S. and Howison, J. and Routley, M. and Spiegel, S.",
BDSKAuthorString,
@"2004", BDSKYearString, @"11", BDSKMonthString,
- @"Source Forge", BDSKJournalString, @"Source Forge",
BDSKContainerString, @"1", BDSKVolumeString, @"96", BDSKPagesString,
+ @"Source Forge", BDSKJournalString, @"1",
BDSKVolumeString, @"96", BDSKPagesString,
NSLocalizedString(@"Keyword1,Keyword2", @"Keywords for
preview item in preferences"), BDSKKeywordsString,
NSLocalizedString(@"Local File Name.pdf", @"Local-Url
for preview item in preferences"), BDSKLocalUrlString, nil];
pubAuthors = [[NSArray alloc] initWithObjects:
@@ -104,6 +104,8 @@
- (NSString *)title { return [pubFields objectForKey:BDSKTitleString]; }
+- (NSString *)container { return [pubFields objectForKey:BDSKContainerString];
}
+
- (NSString *)stringValueOfField:(NSString *)field {
NSString *value = [pubFields objectForKey:field];
return (value != nil) ? value : field;
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2020-12-11 14:44:20 UTC (rev 25179)
+++ trunk/bibdesk/BibItem.m 2020-12-11 15:32:57 UTC (rev 25180)
@@ -1252,8 +1252,6 @@
return [self pubType];
}else if([field isEqualToString:BDSKCiteKeyString]){
return [self citeKey];
- }else if([field isEqualToString:BDSKContainerString]){
- return [self container];
}else if([field isEqualToString:BDSKAllFieldsString]){
return [self allFieldsString];
}else if([field isEqualToString:BDSKRelevanceString]){
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
