Revision: 21914
http://sourceforge.net/p/bibdesk/svn/21914
Author: hofman
Date: 2018-02-13 11:02:38 +0000 (Tue, 13 Feb 2018)
Log Message:
-----------
Revert back to using our own connection to download bibtex data, so we can
control the timeout
Modified Paths:
--------------
trunk/bibdesk/BDSKLinkedBibTeXParser.m
Modified: trunk/bibdesk/BDSKLinkedBibTeXParser.m
===================================================================
--- trunk/bibdesk/BDSKLinkedBibTeXParser.m 2018-02-13 10:52:30 UTC (rev
21913)
+++ trunk/bibdesk/BDSKLinkedBibTeXParser.m 2018-02-13 11:02:38 UTC (rev
21914)
@@ -113,8 +113,26 @@
btURL = [NSURL URLWithString:btURLString];
- NSStringEncoding encoding = NSUTF8StringEncoding;
- bibTeXString = [NSString stringWithContentsOfURL:btURL
usedEncoding:&encoding error:&error];
+ NSURLRequest *request = [NSURLRequest requestWithURL:btURL
cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:60.0];
+ NSURLResponse *response;
+
+ NSData *theData = [NSURLConnection sendSynchronousRequest:request
returningResponse:&response error:&error];
+
+ if (nil != theData) {
+
+ NSString *encodingName = [response textEncodingName];
+ NSStringEncoding encoding = NSUTF8StringEncoding;
+
+ if (nil != encodingName)
+ encoding =
CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)encodingName));
+ if (encoding == kCFStringEncodingInvalidId)
+ encoding = NSUTF8StringEncoding;
+ bibTeXString = [[NSString alloc] initWithData:theData
encoding:encoding];
+ if (nil == bibTeXString)
+ bibTeXString = [[NSString alloc] initWithData:theData
encoding:NSISOLatin1StringEncoding];
+
+ [bibTeXString autorelease];
+ }
}
if (bibTeXString) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
