Revision: 27225
http://sourceforge.net/p/bibdesk/svn/27225
Author: hofman
Date: 2022-01-16 16:48:35 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Transform 'item i of...' specifiers to index specifiers for the element
Modified Paths:
--------------
trunk/bibdesk/BDSKAutoFileCommand.m
Modified: trunk/bibdesk/BDSKAutoFileCommand.m
===================================================================
--- trunk/bibdesk/BDSKAutoFileCommand.m 2022-01-16 16:10:06 UTC (rev 27224)
+++ trunk/bibdesk/BDSKAutoFileCommand.m 2022-01-16 16:48:35 UTC (rev 27225)
@@ -56,6 +56,19 @@
}
- (void)setReceiversSpecifier:(NSScriptObjectSpecifier *)receiversSpecifier {
+ if ([[receiversSpecifier key] isEqualToString:@""]) {
+ // this is an 'item i of linked files' specifier
+ // -indicesOfObjectsByEvaluatingWithContainer:count: does not work here
+ // transform to an index specifier for the element
+ if ([receiversSpecifier isKindOfClass:[NSIndexSpecifier class]] &&
+ [[receiversSpecifier containerSpecifier]
isKindOfClass:[NSPropertySpecifier class]]) {
+ NSPropertySpecifier *spec = (NSPropertySpecifier
*)[receiversSpecifier containerSpecifier];
+ receiversSpecifier = [[[NSIndexSpecifier alloc]
initWithContainerClassDescription:[spec containerClassDescription]
containerSpecifier:[spec containerSpecifier] key:[spec key]
index:[(NSIndexSpecifier *)receiversSpecifier index]] autorelease];
+ } else {
+ [self setScriptErrorNumber:NSArgumentsWrongScriptError];
+ [self setScriptErrorString:@"Do not understand receiver
specifier."];
+ }
+ }
if ([[[receiversSpecifier keyClassDescription] className]
isEqualToString:@"publication"]) {
[super setReceiversSpecifier:receiversSpecifier];
} else {
@@ -145,41 +158,29 @@
return nil;
}
field = BDSKLocalFileString;
- if ([[keySpec key] isEqualToString:@""]) {
- // this is an 'item i of linked files' specifier
- // -indicesOfObjectsByEvaluatingWithContainer:count: does not work
here
- if ([keySpec isKindOfClass:[NSIndexSpecifier class]] == NO ||
- [[keySpec containerSpecifier]
isKindOfClass:[NSPropertySpecifier class]] == NO) {
- [self setScriptErrorNumber:NSArgumentsWrongScriptError];
- [self setScriptErrorString:@"Do not understand linked file
specifier."];
- return nil;
- }
- end = start = [(NSIndexSpecifier *)keySpec index];
+ // NSPropertySpecifier, NSIndexSpecifier, NSRangeSpecifier,
NSMiddleSpecifier, NSWhoseSpecifier
+ NSInteger i, count = -2;
+ NSInteger *indices = [keySpec
indicesOfObjectsByEvaluatingWithContainer:pub count:&count];
+ if (count < -1) {
+ [self setScriptErrorNumber:NSArgumentsWrongScriptError];
+ [self setScriptErrorString:@"Do not understand linked file
specifier."];
+ return nil;
+ }
+ if (count == 0) {
+ return nil;
+ } else if (count == -1) {
+ start = 0;
+ end = -1;
} else {
- // NSPropertySpecifier, NSIndexSpecifier, NSRangeSpecifier,
NSMiddleSpecifier, NSWhoseSpecifier
- NSInteger i, count = -2;
- NSInteger *indices = [keySpec
indicesOfObjectsByEvaluatingWithContainer:pub count:&count];
- if (count < -1) {
- [self setScriptErrorNumber:NSArgumentsWrongScriptError];
- [self setScriptErrorString:@"Do not understand linked file
specifier."];
- return nil;
- }
- if (count == 0) {
- return nil;
- } else if (count == -1) {
- start = 0;
- end = -1;
- } else {
- end = start = indices[0];
- for (i = 1; i < count; i++) {
- if (indices[i] = end + 1) {
- end++;
- } else {
- // not a single range, use an index set, start/end
only holds the first range
- if (indexes == nil)
- indexes = [NSMutableIndexSet
indexSetWithIndexesInRange:NSMakeRange(start, end + 1 - start)];
- [indexes addIndex:indices[i]];
- }
+ end = start = indices[0];
+ for (i = 1; i < count; i++) {
+ if (indices[i] = end + 1) {
+ end++;
+ } else {
+ // not a single range, use an index set, start/end only
holds the first range
+ if (indexes == nil)
+ indexes = [NSMutableIndexSet
indexSetWithIndexesInRange:NSMakeRange(start, end + 1 - start)];
+ [indexes addIndex:indices[i]];
}
}
}
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
