Merge branch '24.05.00' into 24.06.00

Aspen-Discovery · May 14, 2024 · 3fa4014 · 3fa4014
2 parents dbe77f7 + 4ae3341
commit 3fa4014
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 92 deletions.
diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar
diff --git a/code/events_indexer/src/com/turning_leaf_technologies/events/AssabetIndexer.java b/code/events_indexer/src/com/turning_leaf_technologies/events/AssabetIndexer.java
@@ -197,7 +197,7 @@ void indexEvents() {
 
 							//get event type with location_virtual value
 							String eventType = getStringForKey(locationsForCurEvent, "location_virtual");
-							if (eventType != null && eventType.equals("1")){
+							if (eventType != null && eventType.equals("0")){
 								eventType = "In Person";
 							}else {
 								eventType = "Online";

diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar
diff --git a/code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java b/code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java
@@ -27,7 +27,7 @@ public LinkedHashSet<String> getUntranslatedFormatsFromBib(org.marc4j.marc.Recor
 						if (matTypeSubfield != null) {
 							String formatValue = matTypeSubfield.getData().trim();
 							if (indexingProfile.hasTranslation("format", formatValue)) {
-								formats.add(indexingProfile.translateValue("format", formatValue));
+								formats.add(formatValue);
 
 							}
 						}

diff --git a/code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java b/code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java
@@ -734,13 +734,13 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
 						formatCode = fixedField008.getData().toUpperCase().charAt(26);
 						switch (formatCode) {
 							case 'A':
-								result.add("Numeric Data");
+								result.add("NumericData");
 								break;
 							case 'B':
-								result.add("Computer Program");
+								result.add("ComputerProgram");
 								break;
 							case 'G':
-								result.add("Video Game");
+								result.add("VideoGame");
 								break;
 							default:
 								result.add("Electronic");
@@ -757,7 +757,7 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
 						formatCode = fixedField008.getData().toUpperCase().charAt(33);
 						switch (formatCode) {
 							case 'A':
-								result.add("Art Original");
+								result.add("ArtOriginal");
 								break;
 							case 'B':
 								result.add("Kit");
@@ -781,16 +781,16 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
 								result.add("Graphic");
 								break;
 							case 'L':
-								result.add("Technical Drawing");
+								result.add("TechnicalDrawing");
 								break;
 							case 'N':
 								result.add("Chart");
 								break;
 							case 'O':
-								result.add("Flash card");
+								result.add("Flashcard");
 								break;
 							case 'P':
-								result.add("Microscope Slide");
+								result.add("MicroscopeSlide");
 								break;
 							case 'Q':
 								result.add("Model");

diff --git a/code/web/services/MyAccount/ContactInformation.php b/code/web/services/MyAccount/ContactInformation.php
@@ -81,18 +81,23 @@ function launch() {
 						$zip = '';
 
 						//get the correct _REQUEST names as they differ across ILSes
-						foreach ($_REQUEST as $selfRegValue => $val) {
-							if (preg_match('/(.*?)address|street(.*)/', $selfRegValue)) {
-								$streetAddress = $val;
-							} elseif (preg_match('/(.*?)city(.*)/', $selfRegValue)) {
-								$city = $val;
-							} elseif (preg_match('/(.*?)state(.*)/', $selfRegValue)) {
-								//USPS does not accept anything other than 2 character state codes but will use the ZIP to fill in the blank
-								if (strlen($val) == 2) {
-									$state = $val;
+						foreach ($_REQUEST as $contactInfoValue => $val){
+							if (!(preg_match('/(.*?)address2(.*)|(.*?)borrower_B(.*)|(.*?)borrower_alt(.*)/', $contactInfoValue))){
+								if (preg_match('/(.*?)address|street(.*)/', $contactInfoValue)){
+									$streetAddress = $val;
+								}
+								elseif (preg_match('/(.*?)city(.*)/', $contactInfoValue)){
+									$city = $val;
+								}
+								elseif (preg_match('/(.*?)state(.*)/', $contactInfoValue)){
+									//USPS does not accept anything other than 2 character state codes but will use the ZIP to fill in the blank
+									if (strlen($val) == 2){
+										$state = $val;
+									}
+								}
+								elseif (preg_match('/(.*?)zip(.*)/', $contactInfoValue)){
+									$zip = $val;
 								}
-							} elseif (preg_match('/(.*?)zip(.*)/', $selfRegValue)) {
-								$zip = $val;
 							}
 						}
 						require_once ROOT_DIR . '/sys/Utils/SystemUtils.php';

diff --git a/code/web/services/PalaceProject/Collections.php b/code/web/services/PalaceProject/Collections.php
@@ -59,6 +59,18 @@ function canAddNew() {
 		return true;
 	}
 
+	function canBatchEdit() {
+		return false;
+	}
+
+	function canEdit(DataObject $object) {
+		return false;
+	}
+
+	function canEditList() {
+		return false;
+	}
+
 	function canDelete() {
 		return true;
 	}

diff --git a/code/web/sys/Account/User.php b/code/web/sys/Account/User.php
@@ -3683,13 +3683,13 @@ public function getAdminActions() {
 			$sections['palace_project'] = new AdminSection('Palace Project');
 			$palaceProjectSettingsAction = new AdminAction('Settings', 'Define connection information between Palace Project and Aspen Discovery.', '/PalaceProject/Settings');
 			$palaceProjectScopesAction = new AdminAction('Scopes', 'Define which records are loaded for each library and location.', '/PalaceProject/Scopes');
-			$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
+			//$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
 			if ($sections['palace_project']->addAction($palaceProjectSettingsAction, 'Administer Palace Project')) {
 				$palaceProjectSettingsAction->addSubAction($palaceProjectScopesAction, 'Administer Palace Project');
-				$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
+				//$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
 			} else {
 				$sections['palace_project']->addAction($palaceProjectScopesAction, 'Administer Palace Project');
-				$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
+				//$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
 			}
 			$sections['palace_project']->addAction(new AdminAction('Indexing Log', 'View the indexing log for Palace Project.', '/PalaceProject/IndexingLog'), [
 				'View System Reports',

diff --git a/code/web/sys/PalaceProject/PalaceProjectCollection.php b/code/web/sys/PalaceProject/PalaceProjectCollection.php
@@ -83,8 +83,4 @@ public static function getObjectStructure($context = ''): array {
 		];
 		return $structure;
 	}
-
-	public function getEditLink($context): string {
-		return '/PalaceProject/Collections?objectAction=edit&id=' . $this->id;
-	}
 }
diff --git a/code/web/sys/PalaceProject/PalaceProjectSetting.php b/code/web/sys/PalaceProject/PalaceProjectSetting.php
@@ -108,7 +108,7 @@ public static function getObjectStructure($context = ''): array {
 				'sortable' => false,
 				'storeDb' => true,
 				'allowEdit' => true,
-				'canEdit' => true,
+				'canEdit' => false,
 				'canAddNew' => false,
 				'canDelete' => false,
 				'additionalOneToManyActions' => [],

diff --git a/sites/default/translation_maps/format_boost_map.properties b/sites/default/translation_maps/format_boost_map.properties
@@ -4,7 +4,9 @@
 4K/Blu-ray          = 12
 Adobe_EPUB_eBook    = 9
 Adobe_PDF_eBook     = 3
+ArtOriginal         = 1
 Atlas               = 1
+Bingepass           = 1
 Blu-ray             = 12
 Blu-ray/DVD         = 12
 BoardBook           = 3
@@ -16,12 +18,14 @@ BookClubKit         = 1
 BookClubKitLarge    = 1
 Braille             = 1
 CDROM               = 1
+CD+DVD              = 3
+CD+Book             = 3
 Chart               = 1
 ChipCartridge       = 1
 Collage             = 1
 CompactDisc         = 3
-CD+DVD              = 3
-CD+Book             = 3
+ComputerProgram     = 1
+Diorama             = 1
 DVD                 = 12
 DiscCartridge       = 1
 Disney_Online_Book  = 3
@@ -30,9 +34,11 @@ Electronic          = 1
 Filmstrip           = 1
 FlashCard           = 1
 FloppyDisk          = 1
+Game                = 1
 GameCube            = 3
 Globe               = 1
 GoReader            = 1
+Graphic             = 1
 GraphicNovel        = 9
 Journal             = 3
 Kindle_Book         = 9
@@ -43,8 +49,10 @@ LibraryOfThings     = 3
 Manuscript          = 1
 Map                 = 1
 Microfilm           = 1
+MicroscopeSlide     = 1
 Microsoft_eBook     = 9
 Mobipocket_eBook    = 1
+Model               = 1
 MotionPicture       = 1
 MP3Disc             = 3
 MusicCassette       = 1
@@ -55,6 +63,7 @@ NOOK_Periodical     = 3
 Newspaper           = 3
 NintendoDS          = 3
 NintendoSwitch      = 3
+NumericData         = 1
 Open_EPUB_eBook     = 9
 Open_PDF_eBook      = 3
 OverDrive_Listen    = 9
@@ -69,6 +78,7 @@ Phonograph          = 1
 Photo               = 1
 Photonegative       = 1
 PhysicalObject      = 1
+Picture             = 1
 PlayStation         = 3
 PlayStation2        = 3
 PlayStation3        = 3
@@ -81,6 +91,7 @@ PlayawayLaunchpad   = 3
 PlayawayView        = 3
 Pop-UpBook          = 3
 Print               = 1
+Realia              = 1
 SeedPacket          = 1
 SensorImage         = 1
 Serial              = 3
@@ -94,14 +105,17 @@ TapeCartridge       = 1
 TapeCassette        = 1
 TapeRecording       = 1
 TapeReel            = 1
+TechnicalDrawing    = 1
 Thesis              = 1
+Toy                 = 1
 Transparency        = 1
 Unknown             = 1
 VerticalFile        = 1
 Video               = 1
 VideoCartridge      = 1
 VideoCassette       = 3
 VideoDisc           = 12
+VideoGame           = 1
 VideoReel           = 1
 VoxBooks            = 3
 Web_Content         = 9