[Bibdesk-commit] SF.net SVN: bibdesk:[27531] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 27531
          http://sourceforge.net/p/bibdesk/svn/27531
Author:   hofman
Date:     2022-06-03 09:46:44 +0000 (Fri, 03 Jun 2022)
Log Message:
-----------
no need to check for class, we know what we returned

Modified Paths:
--------------
    trunk/bibdesk/BDSKNumdamParser.m
    trunk/bibdesk/BDSKProjectEuclidParser.m

Modified: trunk/bibdesk/BDSKNumdamParser.m
===================================================================
--- trunk/bibdesk/BDSKNumdamParser.m    2022-06-03 09:28:26 UTC (rev 27530)
+++ trunk/bibdesk/BDSKNumdamParser.m    2022-06-03 09:46:44 UTC (rev 27531)
@@ -148,23 +148,21 @@
     if ([results count] > 0 && content != nil) {
         // add Numdam URL to item's own record
         BibItem *item = [results objectAtIndex:0];
+        AGRegex * URLRegexp = [AGRegex regexWithPattern:@"stable URL: 
([a-zA-Z0-9:=./?_]*)" options:0];
+        AGRegexMatch * match = [URLRegexp findInString:content];
         
-        if ( [item isKindOfClass:[BibItem class]] ) {
-            AGRegex * URLRegexp = [AGRegex regexWithPattern:@"stable URL: 
([a-zA-Z0-9:=./?_]*)" options:0];
-            AGRegexMatch * match = [URLRegexp findInString:content];
-            if ([match count] >= 2) {
-                NSString * myURLString = [[match string] 
substringWithRange:[match rangeAtIndex:1]];
+        if ([match count] >= 2) {
+            NSString * myURLString = [[match string] substringWithRange:[match 
rangeAtIndex:1]];
+            
+            if ( myURLString ) {
+                NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
+                BOOL addLinkedFiles = NO == [sud 
boolForKey:BDSKUseLocalUrlAndUrlKey];
+                BOOL addUrlField = addLinkedFiles == NO || [sud 
boolForKey:BDSKAutomaticallyConvertURLFieldsKey] == NO || [sud 
boolForKey:BDSKRemoveConvertedRemoteURLFieldsKey] == NO;
                 
-                if ( myURLString ) {
-                    NSUserDefaults *sud = [NSUserDefaults 
standardUserDefaults];
-                    BOOL addLinkedFiles = NO == [sud 
boolForKey:BDSKUseLocalUrlAndUrlKey];
-                    BOOL addUrlField = addLinkedFiles == NO || [sud 
boolForKey:BDSKAutomaticallyConvertURLFieldsKey] == NO || [sud 
boolForKey:BDSKRemoveConvertedRemoteURLFieldsKey] == NO;
-                    
-                    if ( addUrlField )
-                        [item setField:BDSKUrlString toValue:myURLString];
-                    if ( addLinkedFiles )
-                        [item insertObject:[BDSKLinkedFile 
linkedFileWithURLString:myURLString] inFilesAtIndex:0];
-                }
+                if ( addUrlField )
+                    [item setField:BDSKUrlString toValue:myURLString];
+                if ( addLinkedFiles )
+                    [item insertObject:[BDSKLinkedFile 
linkedFileWithURLString:myURLString] inFilesAtIndex:0];
             }
         }
     }

Modified: trunk/bibdesk/BDSKProjectEuclidParser.m
===================================================================
--- trunk/bibdesk/BDSKProjectEuclidParser.m     2022-06-03 09:28:26 UTC (rev 
27530)
+++ trunk/bibdesk/BDSKProjectEuclidParser.m     2022-06-03 09:46:44 UTC (rev 
27531)
@@ -139,21 +139,18 @@
     if ([results count] > 0 && myIdentifier != nil) {
         // add Project Euclid URL to item's own record
         BibItem * item = [results objectAtIndex:0];
+        AGRegex * ProjectEuclidRegexp = [AGRegex 
regexWithPattern:@"(https://projecteuclid.org/[^\\s]*)" options:0];
+        AGRegexMatch * match = [ProjectEuclidRegexp findInString:myIdentifier];
+        NSString * projectEuclidURLString = [[match string] 
substringWithRange:[match rangeAtIndex:1]];
         
-        if ( [item isKindOfClass:[BibItem class]] ) {
-            AGRegex * ProjectEuclidRegexp = [AGRegex 
regexWithPattern:@"(https://projecteuclid.org/[^\\s]*)" options:0];
-            AGRegexMatch * match = [ProjectEuclidRegexp 
findInString:myIdentifier];
-            NSString * projectEuclidURLString = [[match string] 
substringWithRange:[match rangeAtIndex:1]];
-            
-            if ( projectEuclidURLString ) {
-                NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
-                BOOL addLinkedFiles = NO == [sud 
boolForKey:BDSKUseLocalUrlAndUrlKey];
-                BOOL addUrlField = addLinkedFiles == NO || [sud 
boolForKey:BDSKAutomaticallyConvertURLFieldsKey] == NO || [sud 
boolForKey:BDSKRemoveConvertedRemoteURLFieldsKey] == NO;
-                if ( addUrlField )
-                    [item setField:BDSKUrlString 
toValue:projectEuclidURLString];
-                if ( addLinkedFiles )
-                    [item insertObject:[BDSKLinkedFile 
linkedFileWithURLString:projectEuclidURLString] inFilesAtIndex:0];
-            }
+        if ( projectEuclidURLString ) {
+            NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
+            BOOL addLinkedFiles = NO == [sud 
boolForKey:BDSKUseLocalUrlAndUrlKey];
+            BOOL addUrlField = addLinkedFiles == NO || [sud 
boolForKey:BDSKAutomaticallyConvertURLFieldsKey] == NO || [sud 
boolForKey:BDSKRemoveConvertedRemoteURLFieldsKey] == NO;
+            if ( addUrlField )
+                [item setField:BDSKUrlString toValue:projectEuclidURLString];
+            if ( addLinkedFiles )
+                [item insertObject:[BDSKLinkedFile 
linkedFileWithURLString:projectEuclidURLString] inFilesAtIndex:0];
         }
     }
     

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit