Revision: 18481
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18481&view=rev
Author: hofman
Date: 2012-02-03 17:59:02 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
pass NULL pointer when we ignore isPartialData return value
Modified Paths:
--------------
trunk/bibdesk/BDSKACMDLParser.m
trunk/bibdesk/BDSKBibTeXWebParser.m
trunk/bibdesk/BDSKCiteULikeParser.m
trunk/bibdesk/BDSKHubmedParser.m
trunk/bibdesk/BDSKIEEEXploreParser.m
trunk/bibdesk/BDSKJSTORWebParser.m
trunk/bibdesk/BDSKMathSciNetParser.m
trunk/bibdesk/BDSKWebGroup.m
trunk/bibdesk/BDSKZentralblattParser.m
Modified: trunk/bibdesk/BDSKACMDLParser.m
===================================================================
--- trunk/bibdesk/BDSKACMDLParser.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKACMDLParser.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -109,7 +109,7 @@
bibtexData = [bibtexData stringByReplacingOccurrencesOfString:@" "
withString:@"" options:0 range:newrange];
// parse BibTeX data
- NSArray *parsedItems = [BDSKBibTeXParser itemsFromString:bibtexData
owner:nil isPartialData:NO error:outError];
+ NSArray *parsedItems = [BDSKBibTeXParser itemsFromString:bibtexData
owner:nil isPartialData:NULL error:outError];
if (parsedItems) {
[items addObjectsFromArray:parsedItems];
}
Modified: trunk/bibdesk/BDSKBibTeXWebParser.m
===================================================================
--- trunk/bibdesk/BDSKBibTeXWebParser.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKBibTeXWebParser.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -85,7 +85,7 @@
sourceItem = [inputString substringWithRange:r];
// parse this string as BibTeX, if we can
if ([BDSKBibTeXParser canParseString:sourceItem])
- [items addObjectsFromArray:[BDSKBibTeXParser
itemsFromString:sourceItem owner:nil isPartialData:NO error:outError]];
+ [items addObjectsFromArray:[BDSKBibTeXParser
itemsFromString:sourceItem owner:nil isPartialData:NULL error:outError]];
}
return items;
Modified: trunk/bibdesk/BDSKCiteULikeParser.m
===================================================================
--- trunk/bibdesk/BDSKCiteULikeParser.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKCiteULikeParser.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -80,7 +80,7 @@
BOOL isPartialData = NO;
- NSArray* bibtexItems = [BDSKBibTeXParser itemsFromString:preString
owner:nil isPartialData:&isPartialData error:&error];
+ NSArray* bibtexItems = [BDSKBibTeXParser itemsFromString:preString
owner:nil isPartialData:NULL error:&error];
if ([bibtexItems count] == 0){
// display a fake item in the table rather than the annoying modal
failure alert
NSString *errMsg = NSLocalizedString(@"Unable to parse as BibTeX",
@"google scholar error");
Modified: trunk/bibdesk/BDSKHubmedParser.m
===================================================================
--- trunk/bibdesk/BDSKHubmedParser.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKHubmedParser.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -84,11 +84,9 @@
return nil;
}
- BOOL isPartialData = NO;
-
NSArray* bibtexItems = [BDSKBibTeXParser itemsFromString:bibTeXString
owner:nil
- isPartialData:&isPartialData
+ isPartialData:NULL
error:&error];
if (bibtexItems == nil){
if(outError) *outError = error;
Modified: trunk/bibdesk/BDSKIEEEXploreParser.m
===================================================================
--- trunk/bibdesk/BDSKIEEEXploreParser.m 2012-02-03 17:03:44 UTC (rev
18480)
+++ trunk/bibdesk/BDSKIEEEXploreParser.m 2012-02-03 17:59:02 UTC (rev
18481)
@@ -281,10 +281,9 @@
}
[scanner release];
- BOOL isPartialData;
NSArray *newPubs = nil;
if ([NSString isEmptyString:bibTeXString] == NO)
- newPubs = [BDSKBibTeXParser itemsFromString:bibTeXString owner:nil
isPartialData:&isPartialData error: &error];
+ newPubs = [BDSKBibTeXParser itemsFromString:bibTeXString owner:nil
isPartialData:NULL error: &error];
else
error = [NSError mutableLocalErrorWithCode:kBDSKUnknownError
localizedDescription:NSLocalizedString(@"No data returned from server", @"")];
Modified: trunk/bibdesk/BDSKJSTORWebParser.m
===================================================================
--- trunk/bibdesk/BDSKJSTORWebParser.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKJSTORWebParser.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -91,7 +91,7 @@
bibtexData = [bibtexData substringFromIndex:range.location];
// parse BibTeX data
- NSArray *parsedItems = [BDSKBibTeXParser itemsFromString:bibtexData
owner:nil isPartialData:NO error:outError];
+ NSArray *parsedItems = [BDSKBibTeXParser itemsFromString:bibtexData
owner:nil isPartialData:NULL error:outError];
if (parsedItems) {
[items addObjectsFromArray:parsedItems];
}
Modified: trunk/bibdesk/BDSKMathSciNetParser.m
===================================================================
--- trunk/bibdesk/BDSKMathSciNetParser.m 2012-02-03 17:03:44 UTC (rev
18480)
+++ trunk/bibdesk/BDSKMathSciNetParser.m 2012-02-03 17:59:02 UTC (rev
18481)
@@ -160,9 +160,8 @@
NSString * cleanedRecord = [preContent
stringByCollapsingAndTrimmingCharactersInSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
cleanedRecord = [umlautFixer replaceWithString:@"{$1}"
inString:cleanedRecord];
- BOOL isPartialData;
NSError * parseError;
- NSArray * newPubs = [BDSKBibTeXParser
itemsFromString:cleanedRecord owner:nil isPartialData:&isPartialData error:
&parseError];
+ NSArray * newPubs = [BDSKBibTeXParser
itemsFromString:cleanedRecord owner:nil isPartialData:NULL error: &parseError];
if (newPubs != nil) {
[results addObjectsFromArray:newPubs];
Modified: trunk/bibdesk/BDSKWebGroup.m
===================================================================
--- trunk/bibdesk/BDSKWebGroup.m 2012-02-03 17:03:44 UTC (rev 18480)
+++ trunk/bibdesk/BDSKWebGroup.m 2012-02-03 17:59:02 UTC (rev 18481)
@@ -204,11 +204,10 @@
string = [[[NSString alloc] initWithData:[dataSource data]
encoding:nsEncoding] autorelease];
}
BDSKStringType type = [string contentStringType];
- BOOL isPartialData = NO;
if (type == BDSKBibTeXStringType)
- newPubs = [BDSKBibTeXParser itemsFromString:string owner:nil
isPartialData:&isPartialData error:&error];
+ newPubs = [BDSKBibTeXParser itemsFromString:string owner:nil
isPartialData:NULL error:&error];
else if (type == BDSKNoKeyBibTeXStringType)
- newPubs = [BDSKBibTeXParser itemsFromString:[string
stringWithPhoneyCiteKeys:[BibItem defaultCiteKey]] owner:nil
isPartialData:&isPartialData error:&error];
+ newPubs = [BDSKBibTeXParser itemsFromString:[string
stringWithPhoneyCiteKeys:[BibItem defaultCiteKey]] owner:nil isPartialData:NULL
error:&error];
else if (type != BDSKUnknownStringType)
newPubs = [BDSKStringParser itemsFromString:string ofType:type
error:&error];
}
Modified: trunk/bibdesk/BDSKZentralblattParser.m
===================================================================
--- trunk/bibdesk/BDSKZentralblattParser.m 2012-02-03 17:03:44 UTC (rev
18480)
+++ trunk/bibdesk/BDSKZentralblattParser.m 2012-02-03 17:59:02 UTC (rev
18481)
@@ -149,9 +149,8 @@
NSString * bibTeXString = [[[NSString alloc]
initWithData:result encoding:NSUTF8StringEncoding] autorelease];
bibTeXString = [bibTeXString
stringByCollapsingAndTrimmingCharactersInSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
bibTeXString = [umlautFixer replaceWithString:@"{$1}"
inString:bibTeXString];
- BOOL isPartialData;
NSError * ignoreError;
- NSArray * newPubs = [BDSKBibTeXParser
itemsFromString:bibTeXString owner:nil isPartialData:&isPartialData error:
&ignoreError];
+ NSArray * newPubs = [BDSKBibTeXParser
itemsFromString:bibTeXString owner:nil isPartialData:NULL error: &ignoreError];
if (newPubs != nil) {
[results addObjectsFromArray:newPubs];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
