Revision: 11542
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11542&view=rev
Author: hofman
Date: 2007-11-11 09:41:41 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
Some more changes to reflect changes in Omni frameworks.
Modified Paths:
--------------
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKMARCParser.m
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReadMeController.m
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferParser.m
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferenceMinerParser.m
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKWebOfScienceParser.m
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKMARCParser.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKMARCParser.m 2007-11-11
17:32:50 UTC (rev 11541)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKMARCParser.m 2007-11-11
17:41:41 UTC (rev 11542)
@@ -44,6 +44,7 @@
#import <OmniFoundation/NSScanner-OFExtensions.h>
#import <OmniFoundation/NSString-OFExtensions.h>
#import <AGRegex/AGRegex.h>
+#import "NSError_BDSKExtensions.h"
@interface NSString (BDSKMARCParserExtensions)
@@ -88,7 +89,7 @@
if(match == nil){
if(outError)
- OFErrorWithInfo(outError, BDSKParserError,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown MARC format.", @"Error
description"), nil);
+ OFErrorWithInfo(outError, kBDSKParserFailed,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown MARC format.", @"Error
description"), nil);
return [NSArray array];
}
@@ -294,7 +295,7 @@
return [self itemsFromMARCXMLString:itemString error:outError];
}else {
if(outError)
- OFErrorWithInfo(outError, BDSKParserError,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown MARC format.", @"Error
description"), nil);
+ OFErrorWithInfo(outError, kBDSKParserFailed,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown MARC format.", @"Error
description"), nil);
return [NSArray array];
}
}
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReadMeController.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReadMeController.m
2007-11-11 17:32:50 UTC (rev 11541)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReadMeController.m
2007-11-11 17:41:41 UTC (rev 11542)
@@ -145,7 +145,8 @@
[ic launchMailTo:@"[EMAIL PROTECTED]"
carbonCopy:nil
subject:[NSString stringWithFormat:@"BibDesk %@ exception
reported %@", version, [[NSDate date] description]]
- body:body];
+ body:body
+ error:NULL];
}
@catch(id exception){
NSLog(@"caught exception %@ in exception viewer", exception);
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferParser.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferParser.m 2007-11-11
17:32:50 UTC (rev 11541)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferParser.m 2007-11-11
17:41:41 UTC (rev 11542)
@@ -40,6 +40,7 @@
#import "BibItem.h"
#import "NSString_BDSKExtensions.h"
#import "BDSKTypeManager.h"
+#import "NSError_BDSKExtensions.h"
/*
For format, see
http://www.ecst.csuchico.edu/~jacobsd/bib/formats/endnote.html and the man page
for refer(1). There's apparently an old-style refer format, and one that's
bastardized for EndNote. I'm adding this parser solely because this file
format is returned by AGU's search at the moment, so supporting the version
described by the man page for refer(1) isn't a high priority.
@@ -168,7 +169,7 @@
NSRange startRange = [itemString rangeOfString:@"%"
options:NSLiteralSearch];
if (startRange.location == NSNotFound){
- OFErrorWithInfo(&error, BDSKParserError, NSLocalizedDescriptionKey,
NSLocalizedString(@"This is not a Refer string", @"Error description"), nil);
+ OFErrorWithInfo(&error, kBDSKParserFailed, NSLocalizedDescriptionKey,
NSLocalizedString(@"This is not a Refer string", @"Error description"), nil);
if(outError) *outError = error;
return returnArray;
}
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferenceMinerParser.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferenceMinerParser.m
2007-11-11 17:32:50 UTC (rev 11541)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKReferenceMinerParser.m
2007-11-11 17:41:41 UTC (rev 11542)
@@ -41,6 +41,7 @@
#import "BDSKPubMedparser.h"
#import "BDSKRISParser.h"
#import "BDSKMARCParser.h"
+#import "NSError_BDSKExtensions.h"
@interface NSString (ReferenceMinerExtensions)
@@ -83,7 +84,7 @@
return [BDSKMARCParser itemsFromString:itemString error:outError];
}else{
if(outError)
- OFErrorWithInfo(outError, BDSKParserError,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown Reference Miner
format.", @"Error description"), nil);
+ OFErrorWithInfo(outError, kBDSKParserFailed,
NSLocalizedDescriptionKey, NSLocalizedString(@"Unknown Reference Miner
format.", @"Error description"), nil);
return [NSArray array];
}
}
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKWebOfScienceParser.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKWebOfScienceParser.m
2007-11-11 17:32:50 UTC (rev 11541)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKWebOfScienceParser.m
2007-11-11 17:41:41 UTC (rev 11542)
@@ -40,6 +40,7 @@
#import "BibItem.h"
#import "NSString_BDSKExtensions.h"
#import "BDSKTypeManager.h"
+#import "NSError_BDSKExtensions.h"
static void mergePageNumbers(NSMutableDictionary *dict)
{
@@ -155,7 +156,7 @@
// for now, we'll only support version 1.0
NSRange startRange = [itemString rangeOfString:@"VR 1.0\n"
options:NSLiteralSearch];
if (startRange.location == NSNotFound){
- OFErrorWithInfo(&error, BDSKParserError, NSLocalizedDescriptionKey,
NSLocalizedString(@"This Web of Science version is not supported", @"Error
description"), nil);
+ OFErrorWithInfo(&error, kBDSKParserFailed, NSLocalizedDescriptionKey,
NSLocalizedString(@"This Web of Science version is not supported", @"Error
description"), nil);
if(outError) *outError = error;
return returnArray;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
