Revision: 28956 http://sourceforge.net/p/bibdesk/svn/28956 Author: hofman Date: 2024-10-15 14:25:36 +0000 (Tue, 15 Oct 2024) Log Message: ----------- complete Location field as single valued field
Modified Paths: -------------- trunk/bibdesk/BDSKCompletionManager.m trunk/bibdesk/BDSKDublinCoreXMLParser.m trunk/bibdesk/BDSKPRISMParser.m trunk/bibdesk/BDSKStringConstants.h trunk/bibdesk/BDSKStringConstants.m trunk/bibdesk/BDSKTypeManager.m Modified: trunk/bibdesk/BDSKCompletionManager.m =================================================================== --- trunk/bibdesk/BDSKCompletionManager.m 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKCompletionManager.m 2024-10-15 14:25:36 UTC (rev 28956) @@ -55,7 +55,7 @@ + (void)initialize { BDSKINITIALIZE; - completedFields = [[NSSet alloc] initWithObjects:BDSKBooktitleString, BDSKJournalString, BDSKSeriesString, BDSKInstitutionString, BDSKPublisherString, BDSKSchoolString, BDSKOrganizationString, BDSKAddressString, BDSKKeywordsString, BDSKCrossrefString, nil]; + completedFields = [[NSSet alloc] initWithObjects:BDSKBooktitleString, BDSKJournalString, BDSKSeriesString, BDSKInstitutionString, BDSKPublisherString, BDSKSchoolString, BDSKOrganizationString, BDSKAddressString, BDSKKeywordsString, BDSKLocationString, BDSKCrossrefString, nil]; NSArray *extraFields = [[NSUserDefaults standardUserDefaults] stringArrayForKey:BDSKAdditionalFieldsToCompleteKey]; if ([extraFields count]) completedFields = [completedFields setByAddingObjectsFromArray:extraFields]; Modified: trunk/bibdesk/BDSKDublinCoreXMLParser.m =================================================================== --- trunk/bibdesk/BDSKDublinCoreXMLParser.m 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKDublinCoreXMLParser.m 2024-10-15 14:25:36 UTC (rev 28956) @@ -132,7 +132,7 @@ [pubDict setObject:joinedArrayComponents(array, separator) forKey:BDSKPublisherString]; if ((array = dcProperties(node, @"location"))) - [pubDict setObject:joinedArrayComponents(array, separator) forKey:@"Location"]; + [pubDict setObject:joinedArrayComponents(array, separator) forKey:BDSKLocationString]; if ((array = dcProperties(node, @"date"))) [pubDict setObject:joinedArrayComponents(array, separator) forKey:BDSKDateString]; Modified: trunk/bibdesk/BDSKPRISMParser.m =================================================================== --- trunk/bibdesk/BDSKPRISMParser.m 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKPRISMParser.m 2024-10-15 14:25:36 UTC (rev 28956) @@ -110,7 +110,7 @@ [pubDict setObject:[array firstObject] forKey:BDSKPublisherString]; if ((array = getProperties(node, @"dc:location"))) - [pubDict setObject:[array firstObject] forKey:@"Location"]; + [pubDict setObject:[array firstObject] forKey:BDSKLocationString]; if ((array = getProperties(node, @"prism:coverDate")) || (array = getProperties(node, @"dc:date")) || Modified: trunk/bibdesk/BDSKStringConstants.h =================================================================== --- trunk/bibdesk/BDSKStringConstants.h 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKStringConstants.h 2024-10-15 14:25:36 UTC (rev 28956) @@ -256,6 +256,7 @@ extern NSString *BDSKInstitutionString; extern NSString *BDSKSchoolString; extern NSString *BDSKOrganizationString; +extern NSString *BDSKLocationString; extern NSString *BDSKDoiString; extern NSString *BDSKCiteseerUrlString; extern NSString *BDSKColorString; Modified: trunk/bibdesk/BDSKStringConstants.m =================================================================== --- trunk/bibdesk/BDSKStringConstants.m 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKStringConstants.m 2024-10-15 14:25:36 UTC (rev 28956) @@ -257,6 +257,7 @@ NSString *BDSKInstitutionString = @"Institution"; NSString *BDSKSchoolString = @"School"; NSString *BDSKOrganizationString = @"Organization"; +NSString *BDSKLocationString = @"Location"; NSString *BDSKDoiString = @"Doi"; NSString *BDSKCiteseerUrlString = @"Citeseerurl"; Modified: trunk/bibdesk/BDSKTypeManager.m =================================================================== --- trunk/bibdesk/BDSKTypeManager.m 2024-10-15 09:25:39 UTC (rev 28955) +++ trunk/bibdesk/BDSKTypeManager.m 2024-10-15 14:25:36 UTC (rev 28956) @@ -254,7 +254,7 @@ BDSKAbstractString, BDSKAnnoteString, BDSKRssDescriptionString, nil]; [invalidFields unionSet:allURLFields]; - NSMutableSet *singleValuedFields = [NSMutableSet setWithObjects:BDSKPubTypeString, BDSKTypeString, BDSKCrossrefString, BDSKJournalString, BDSKBooktitleString, BDSKVolumetitleString, BDSKSeriesString, BDSKYearString, BDSKMonthString, BDSKPublisherString, BDSKAddressString, BDSKInstitutionString, BDSKSchoolString, BDSKOrganizationString, BDSKColorString, nil]; + NSMutableSet *singleValuedFields = [NSMutableSet setWithObjects:BDSKPubTypeString, BDSKTypeString, BDSKCrossrefString, BDSKJournalString, BDSKBooktitleString, BDSKVolumetitleString, BDSKSeriesString, BDSKYearString, BDSKMonthString, BDSKPublisherString, BDSKAddressString, BDSKInstitutionString, BDSKSchoolString, BDSKOrganizationString, BDSKLocationString, BDSKColorString, nil]; [singleValuedFields unionSet:ratingFields]; [singleValuedFields unionSet:booleanFields]; [singleValuedFields unionSet:triStateFields]; 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