diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar index b6eeb02a5f..5577843cc7 100644 Binary files a/code/events_indexer/events_indexer.jar and b/code/events_indexer/events_indexer.jar differ 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 index 54c9f41755..f8638536aa 100644 --- 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 index 6700961f55..39b7fcadce 100644 Binary files a/code/reindexer/reindexer.jar and b/code/reindexer/reindexer.jar differ diff --git a/code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java b/code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java index 202c0fb8c2..608170d7c8 100644 --- 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 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 index c4f95a2321..06d648b614 100644 --- 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 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 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 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 index 3ab41c96a6..cdd1d06fac 100644 --- 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 index 4f35e201b6..5dab954c1e 100644 --- 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 index 89d41f9721..4c34068c7d 100644 --- 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 index c4944f6850..0cdde70fbe 100644 --- 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; - } } \ No newline at end of file diff --git a/code/web/sys/PalaceProject/PalaceProjectSetting.php b/code/web/sys/PalaceProject/PalaceProjectSetting.php index 3e4d673c10..f95d4fa84f 100644 --- 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 index 5b1c3323be..669867a9b8 100644 --- 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,7 +105,9 @@ TapeCartridge = 1 TapeCassette = 1 TapeRecording = 1 TapeReel = 1 +TechnicalDrawing = 1 Thesis = 1 +Toy = 1 Transparency = 1 Unknown = 1 VerticalFile = 1 @@ -102,6 +115,7 @@ Video = 1 VideoCartridge = 1 VideoCassette = 3 VideoDisc = 12 +VideoGame = 1 VideoReel = 1 VoxBooks = 3 Web_Content = 9 diff --git a/sites/default/translation_maps/format_category_map.properties b/sites/default/translation_maps/format_category_map.properties index 3e21e462cc..1a732993bf 100644 --- a/sites/default/translation_maps/format_category_map.properties +++ b/sites/default/translation_maps/format_category_map.properties @@ -1,51 +1,58 @@ # DATA FROM INDEXER = Label -3DS = -4KBlu-ray = Movies +3DS = Other +4KBlu-ray = Movies 4K/Blu-ray = Movies Adobe_EPUB_eBook = eBook Adobe_PDF_eBook = eBook -Atlas = +ArtOriginal = Other +Atlas = Books Bingepass = Other Blu-ray = Movies Blu-ray/DVD = Movies BoardBook = Books Book = Books -Book+DVD = Books Book+CD = Books Book+CD-ROM = Books +Book+DVD = Books BookClubKit = Books BookClubKitLarge = Books Braille = Books -CDROM = -Chart = -ChipCartridge = -Collage = -CompactDisc = Audio Books +CDROM = Other CD+DVD = Music -CD+Book = Audio Books +CD+Book = Music +Chart = Other +ChipCartridge = Other +Collage = Other +CompactDisc = Audio Books +ComputerProgram = Other +Diorama = Other DVD = Movies -DiscCartridge = +DiscCartridge = Other Disney_Online_Book = eBook -Drawing = -Electronic = +Drawing = Other +Electronic = Other Filmstrip = Movies -FlashCard = -FloppyDisk = -GameCube = -Globe = +FlashCard = Other +FloppyDisk = Other +Game = Other +GameCube = Other +Globe = Other GoReader = Audio Books +Graphic = Other GraphicNovel = Books Journal = Books Kindle_Book = eBook -Kinect = -Kit = +Kinect = Other +Kit = Other LargePrint = Books -LibraryOfThings = +LibraryOfThings = Other Manuscript = Books -Map = -Microfilm = +Map = Other +Microfilm = Other +MicroscopeSlide = Other Microsoft_eBook = eBook Mobipocket_eBook = eBook +Model = Other MotionPicture = Movies MP3Disc = Audio Books MusicCassette = Music @@ -54,8 +61,9 @@ MusicRecording = Music MusicalScore = Books NOOK_Periodical = eBook Newspaper = Books -NintendoDS = -NintendoSwitch = +NintendoDS = Other +NintendoSwitch = Other +NumericData = Other Open_EPUB_eBook = eBook Open_PDF_eBook = eBook OverDrive_Listen = Audio Books @@ -64,55 +72,60 @@ OverDrive_Music = Music OverDrive_Read = eBook OverDrive_Video = Movies OverDrive_WMA_Audiobook = Audio Books -Painting = +Painting = Other Palm = eBook Phonograph = Audio Books -Photo = -Photonegative = -PhysicalObject = -PlayStation = -PlayStation2 = -PlayStation3 = -PlayStation4 = -PlayStation5 = -PlayStationVita = +Photo = Other +Photonegative = Other +PhysicalObject = Other +Picture = Other +PlayStation = Other +PlayStation2 = Other +PlayStation3 = Other +PlayStation4 = Other +PlayStation5 = Other +PlayStationVita = Other Playaway = Audio Books PlayawayBookpack = Books -PlayawayLaunchpad = -PlayawayView = +PlayawayLaunchpad = Other +PlayawayView = Other Pop-UpBook = Books -Print = -SeedPacket = -SensorImage = +Print = Other +Realia = Other +SeedPacket = Other +SensorImage = Other Serial = Books -Slide = -Software = +Slide = Other +Software = Other SoundCassette = Audio Books SoundDisc = Audio Books SoundRecording = Audio Books Streaming_Video = Movies -TapeCartridge = -TapeCassette = +TapeCartridge = Other +TapeCassette = Other TapeRecording = Audio Books -TapeReel = -Thesis = -Transparency = -Unknown = -VerticalFile = +TapeReel = Other +TechnicalDrawing = Other +Thesis = Books +Toy = Other +Transparency = Other +Unknown = Other +VerticalFile = Other Video = Movies VideoCartridge = Movies VideoCassette = Movies VideoDisc = Movies +VideoGame = Other VideoReel = Movies VoxBooks = Audio Books -Web_Content = -Wii = -WiiU = -WindowsGame = -Wonderbook = -Xbox360 = -XboxOne = -XboxSeriesX = +Web_Content = Other +Wii = Other +WiiU = Other +WindowsGame = Other +Wonderbook = Other +Xbox360 = Other +XboxOne = Other +XboxSeriesX = Other eAudiobook = Audio Books eBook = eBook eComic = eBook @@ -120,18 +133,18 @@ eMagazine = eBook eMusic = Music eVideo = Movies epub = eBook -externalLink = +externalLink = Other externalMP3 = Audio Books external_eaudio = Audio Books external_ebook = eBook external_emusic = Music external_evideo = Movies -external_web = -gif = -gifs = +external_web = Other +gif = Other +gifs = Other interactiveBook = eBook itunes = Audio Books -jpg = +jpg = Other kindle = eBook mobi = eBook mp3 = Audio Books diff --git a/sites/default/translation_maps/format_map.properties b/sites/default/translation_maps/format_map.properties index 1dbeb6c641..d9d4c0cd65 100644 --- a/sites/default/translation_maps/format_map.properties +++ b/sites/default/translation_maps/format_map.properties @@ -4,7 +4,9 @@ 4K/Blu-ray = 4K / Blu-ray Combo Adobe_EPUB_eBook = EPUB eBook Adobe_PDF_eBook = PDF eBook +ArtOriginal = Original Art Atlas = Atlas +Bingepass = Bingepass Blu-ray = Blu-ray Blu-ray/DVD = Blu-ray / DVD Combo BoardBook = Board Book @@ -18,10 +20,12 @@ Braille = Braille CDROM = Software CD+Book = CD + Book CD+DVD = CD + DVD Combo -Chart = Photo +Chart = Chart ChipCartridge = Software Collage = Photo CompactDisc = CD +ComputerProgram = ComputerProgram +Diorama = Diorama DVD = DVD DiscCartridge = Software Disney_Online_Book = Online Book @@ -30,8 +34,11 @@ Electronic = Electronic Filmstrip = Video FlashCard = Photo FloppyDisk = Software +Game = Game +GameCube = GameCube Globe = Globe GoReader = GoReader +Graphic = Graphic GraphicNovel = Graphic Novel Journal = Journal Kindle_Book = Kindle eBook @@ -42,8 +49,10 @@ LibraryOfThings = Library Of Things Manuscript = Manuscript Map = Map Microfilm = Microfilm +MicroscopeSlide = Microscope Slide Microsoft_eBook = eBook Mobipocket_eBook = Mobipocket eBook +Model = Model MotionPicture = Video MP3Disc = Audiobook MP3-CD MusicCassette = Music Cassette @@ -54,6 +63,7 @@ NOOK_Periodical = Nook Periodicals Newspaper = Newspaper NintendoDS = Nintendo DS NintendoSwitch = Nintendo Switch +NumericData = Numeric Data Open_EPUB_eBook = EPUB eBook Open_PDF_eBook = PDF eBook OverDrive_Listen = OverDrive Listen @@ -68,6 +78,7 @@ Phonograph = Phonograph Photo = Photo Photonegative = Photo PhysicalObject = Physical Object +Picture = Picture PlayStation = PlayStation PlayStation2 = PlayStation 2 PlayStation3 = PlayStation 3 @@ -80,6 +91,7 @@ PlayawayLaunchpad = Playaway Launchpad PlayawayView = Playaway View Pop-UpBook = Pop-Up Book Print = Print +Realia = Realia SeedPacket = Seed Packet SensorImage = Sensor Image Serial = Serial @@ -93,7 +105,9 @@ TapeCartridge = Software TapeCassette = Software TapeRecording = Tape Recording TapeReel = Software +TechnicalDrawing = Technical Drawing Thesis = Thesis +Toy = Toy Transparency = Slide Unknown = Unknown VerticalFile = Vertical File @@ -101,6 +115,7 @@ Video = Video VideoCartridge = Video VideoCassette = VHS VideoDisc = DVD +VideoGame = Video Game VideoReel = Video VoxBooks = VOX Books Web_Content = Web Content