PTFS-Europe · AlexanderBlanchardAC · Jan 16, 2025 · Jan 15, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/code/axis_360_export/axis_360_export.jar b/code/axis_360_export/axis_360_export.jar
diff --git a/code/carlx_export/carlx_export.jar b/code/carlx_export/carlx_export.jar
diff --git a/code/cloud_library_export/cloud_library_export.jar b/code/cloud_library_export/cloud_library_export.jar
diff --git a/code/course_reserves_indexer/course_reserves_indexer.jar b/code/course_reserves_indexer/course_reserves_indexer.jar
diff --git a/code/cron/cron.jar b/code/cron/cron.jar
diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar
diff --git a/code/evergreen_export/evergreen_export.jar b/code/evergreen_export/evergreen_export.jar
diff --git a/code/evolve_export/evolve_export.jar b/code/evolve_export/evolve_export.jar
diff --git a/code/hoopla_export/hoopla_export.jar b/code/hoopla_export/hoopla_export.jar
diff --git a/code/java_shared_libraries/src/com/turning_leaf_technologies/indexing/IndexingProfile.java b/code/java_shared_libraries/src/com/turning_leaf_technologies/indexing/IndexingProfile.java
@@ -85,6 +85,7 @@ public class IndexingProfile extends BaseIndexingSettings {
 	private int orderRecordsToSuppressByDate;
 	private boolean checkSierraMatTypeForFormat;
 	private boolean index856Links;
+	private boolean index856LinkOnlyIfNoEcontentRecord;
 	private String treatUnknownAudienceAs;
 
 	//Fields for loading order information
@@ -263,6 +264,7 @@ public IndexingProfile(String serverName, ResultSet indexingProfileRS, Connectio
 
 		index856Links = indexingProfileRS.getBoolean("index856Links");
 		treatUnknownAudienceAs = indexingProfileRS.getString("treatUnknownAudienceAs");
+		index856LinkOnlyIfNoEcontentRecord = indexingProfileRS.getBoolean("index856LinkOnlyIfNoEcontentRecord");
 
 		//Custom Facet 1
 		this.customFacet1SourceField = indexingProfileRS.getString("customFacet1SourceField");
@@ -1106,6 +1108,14 @@ public void setIndex856Links(boolean index856Links) {
 		this.index856Links = index856Links;
 	}
 
+	public boolean isIndex856LinkOnlyIfNoEcontentRecord() {
+		return index856LinkOnlyIfNoEcontentRecord;
+	}
+
+	public void setIndex856LinkOnlyIfNoEcontentRecord() {
+		this.index856LinkOnlyIfNoEcontentRecord = index856LinkOnlyIfNoEcontentRecord;
+	}
+
 	public String getTreatUnknownAudienceAs() {
 		return treatUnknownAudienceAs;
 	}

diff --git a/code/koha_export/koha_export.jar b/code/koha_export/koha_export.jar
diff --git a/code/oai_indexer/oai_indexer.jar b/code/oai_indexer/oai_indexer.jar
diff --git a/code/overdrive_extract/overdrive_extract.jar b/code/overdrive_extract/overdrive_extract.jar
diff --git a/code/palace_project_export/palace_project_export.jar b/code/palace_project_export/palace_project_export.jar
diff --git a/code/polaris_export/polaris_export.jar b/code/polaris_export/polaris_export.jar
diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar
diff --git a/code/reindexer/src/org/aspen_discovery/reindexer/IlsRecordProcessor.java b/code/reindexer/src/org/aspen_discovery/reindexer/IlsRecordProcessor.java
@@ -1387,6 +1387,10 @@ protected String getItemStatus(DataField itemField, String recordIdentifier){
 	protected List<RecordInfo> loadUnsuppressedEContentItems(AbstractGroupedWorkSolr groupedWork, String identifier, org.marc4j.marc.Record record, StringBuilder suppressionNotes, RecordInfo mainRecordInfo, boolean hasParentRecord, boolean hasChildRecords){
 		List<RecordInfo> unsuppressedEcontentRecords = new ArrayList<>();
 		if (settings.isIndex856Links()) {
+			boolean hasEContentItems = !mainRecordInfo.getRelatedItems().isEmpty() && mainRecordInfo.getRelatedItems().stream().anyMatch(curItem->curItem.isEContent());
+			if (settings.isIndex856LinkOnlyIfNoEcontentRecord() && hasEContentItems) {
+				return unsuppressedEcontentRecords;
+			}
 			List<DataField> recordUrls = MarcUtil.getDataFields(record, 856);
 			if (recordUrls.isEmpty()) {
 				return unsuppressedEcontentRecords;

diff --git a/code/sideload_processing/sideload_processing.jar b/code/sideload_processing/sideload_processing.jar
diff --git a/code/sierra_export_api/sierra_export_api.jar b/code/sierra_export_api/sierra_export_api.jar
diff --git a/code/symphony_export/symphony_export.jar b/code/symphony_export/symphony_export.jar
diff --git a/code/user_list_indexer/user_list_indexer.jar b/code/user_list_indexer/user_list_indexer.jar
diff --git a/code/web/interface/themes/responsive/js/aspen.js b/code/web/interface/themes/responsive/js/aspen.js
diff --git a/code/web/interface/themes/responsive/js/aspen/indexing-profile.js b/code/web/interface/themes/responsive/js/aspen/indexing-profile.js
@@ -47,7 +47,7 @@ AspenDiscovery.IndexingClass = (function () {
 					'propertyRowtranslationMaps', 'FloatingSave', 'propertyRowindex856Links', 'propertyRowincludePersonalAndCorporateNamesInTopics',
 					'propertyRowcustomFacetSection', 'propertyRowcustomFacet1SourceField', 'propertyRowcustomFacet1ValuesToInclude', 'propertyRowcustomFacet1ValuesToExclude',
 					'propertyRowcustomFacet2SourceField', 'propertyRowcustomFacet2ValuesToInclude', 'propertyRowcustomFacet2ValuesToExclude',
-					'propertyRowcustomFacet3SourceField', 'propertyRowcustomFacet3ValuesToInclude', 'propertyRowcustomFacet3ValuesToExclude'
+					'propertyRowcustomFacet3SourceField', 'propertyRowcustomFacet3ValuesToInclude', 'propertyRowcustomFacet3ValuesToExclude', 'propertyRowindex856LinkOnlyIfNoEcontentRecord'
 				],
 				//Specific per class
 				Koha: ['propertyRowlastUpdateOfAuthorities'],

diff --git a/code/web/release_notes/25.02.00.MD b/code/web/release_notes/25.02.00.MD
@@ -69,6 +69,8 @@
 //james
 
 //alexander
+### Indexing Updates
+- Add an option in the Indexing Profile to only index records by their 856 field if they do not contain any items that are treated as eContent. (*AB*)
 
 //chloe
 ### WebBuilder Updates

diff --git a/code/web/sys/DBMaintenance/version_updates/25.02.00.php b/code/web/sys/DBMaintenance/version_updates/25.02.00.php
@@ -50,7 +50,7 @@ function getUpdates25_02_00(): array {
 				'ALTER TABLE two_factor_auth_settings ADD COLUMN accountProfileId INT',
 				"UPDATE two_factor_auth_settings set accountProfileId = (SELECT MIN(id) from account_profiles where ils <> 'na' and name <> 'admin')"
 			]
-		]
+		],
 
 		//katherine
 
@@ -59,6 +59,14 @@ function getUpdates25_02_00(): array {
 		//kodi
 
 		//alexander - PTFS-Europe
+		'indexing_records_with_econtent' => [
+			'title' => 'Indexing Records With Econtent',
+			'description' => 'Whether records with eContent as an item should also index via 856 field.',
+			'continueOnError' => true,
+			'sql' => [
+				'ALTER TABLE indexing_profiles ADD COLUMN index856LinkOnlyIfNoEcontentRecord TINYINT(1) NOT NULL DEFAULT 0'
+			],
+		],
 
 		//chloe - PTFS-Europe
 

diff --git a/code/web/sys/Indexing/IndexingProfile.php b/code/web/sys/Indexing/IndexingProfile.php
@@ -176,6 +176,7 @@ class IndexingProfile extends DataObject {
 
 	public $evergreenOrgUnitSchema;
 	public $index856Links;
+	public $index856LinkOnlyIfNoEcontentRecord;
 	public /** @noinspection PhpUnused */ $includePersonalAndCorporateNamesInTopics;
 
 	public $orderRecordsStatusesToInclude;
@@ -226,7 +227,8 @@ public function getNumericColumnNames(): array {
 			'orderRecordsToSuppressByDate',
 			'numRetriesForBibLookups',
 			'numMillisecondsToPauseAfterBibLookups',
-			'numExtractionThreads'
+			'numExtractionThreads',
+			'index856LinkOnlyIfNoEcontentRecord'
 		];
 	}
 
@@ -484,6 +486,16 @@ static function getObjectStructure($context = ''): array {
 				'forcesReindex' => true,
 			],
 
+			'index856LinkOnlyIfNoEcontentRecord' => [
+				'property' => 'index856LinkOnlyIfNoEcontentRecord',
+				'type' => 'checkbox',
+				'label' => 'Index 856 Links Only For Records Without eContent Items',
+				'description' => 'Whether or not records that have eContent items attached should be indexed by the 856 field when Index 856 Links is selected.',
+				'defaultValue' => false,
+				'hideInLists' => true,
+				'forcesReindex' => true,
+			],
+
 			'suppressRecordsWithUrlsMatching' => [
 				'property' => 'suppressRecordsWithUrlsMatching',
 				'hiddenByDefault' => true ,

diff --git a/code/web_indexer/web_indexer.jar b/code/web_indexer/web_indexer.jar