Merge pull request #168 from AlexanderBlanchardAC/DIS-196-856-Indexin…

…g-For-Records-With-Econtent Dis 196 856 indexing for records with econtent
PTFS-Europe · Jan 17, 2025 · 8feb95f · 8feb95f
2 parents d7a92bc + c775ade
commit 8feb95f
Show file tree

Hide file tree

Showing 24 changed files with 18 additions and 7 deletions.
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
@@ -84,7 +84,7 @@ public class IndexingProfile extends BaseIndexingSettings {
 	private boolean hideOrderRecordsForBibsWithPhysicalItems;
 	private int orderRecordsToSuppressByDate;
 	private boolean checkSierraMatTypeForFormat;
-	private boolean index856Links;
+	private int index856Links;
 	private String treatUnknownAudienceAs;
 
 	//Fields for loading order information
@@ -260,7 +260,7 @@ public IndexingProfile(String serverName, ResultSet indexingProfileRS, Connectio
 
 		this.checkSierraMatTypeForFormat = indexingProfileRS.getBoolean("checkSierraMatTypeForFormat");
 
-		index856Links = indexingProfileRS.getBoolean("index856Links");
+		index856Links = indexingProfileRS.getInt("index856Links");
 		treatUnknownAudienceAs = indexingProfileRS.getString("treatUnknownAudienceAs");
 
 		//Custom Facet 1
@@ -1093,11 +1093,11 @@ public void setOrderStatusSubfield(char orderStatusSubfield) {
 		this.orderStatusSubfield = orderStatusSubfield;
 	}
 
-	public boolean isIndex856Links() {
+	public int getIndex856Links() {
 		return index856Links;
 	}
 
-	public void setIndex856Links(boolean index856Links) {
+	public void setIndex856Links(int index856Links) {
 		this.index856Links = index856Links;
 	}
 

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
@@ -1386,7 +1386,11 @@ 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()) {
+		if (settings.getIndex856Links() == 1 || settings.getIndex856Links() == 2) {
+			boolean hasEContentItems = !mainRecordInfo.getRelatedItems().isEmpty() && mainRecordInfo.getRelatedItems().stream().anyMatch(curItem->curItem.isEContent());
+			if (settings.getIndex856Links() == 2 && 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/release_notes/25.02.00.MD b/code/web/release_notes/25.02.00.MD
@@ -85,6 +85,8 @@
 //james
 
 //alexander
+### Indexing Updates
+- Add the option of only indexing records by the 856 field if the record does not have eContent items. (*AB*)
 
 //chloe
 ### WebBuilder Updates

diff --git a/code/web/sys/Indexing/IndexingProfile.php b/code/web/sys/Indexing/IndexingProfile.php
@@ -838,10 +838,15 @@ static function getObjectStructure($context = ''): array {
 						'properties' => [
 							'index856Links' => [
 								'property' => 'index856Links',
-								'type' => 'checkbox',
+								'type' => 'enum',
 								'label' => 'Index 856 links',
+								'values' => [
+									0 => 'None',
+									1 => 'Always',
+									2 => 'Only When No eContent Items Are Found'
+								],
 								'description' => 'Whether or not 856 links with a first indicator of 4 and second indicator of 0 or 1 are indexed and treated as items.',
-								'defaultValue' => false,
+								'defaultValue' => 0,
 								'hideInLists' => true,
 								'forcesReindex' => true,
 							],

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