Skip to content

Commit

Permalink
Merge branch 'Aspen-Discovery:24.05.00' into 24.05.00
Browse files Browse the repository at this point in the history
  • Loading branch information
@K-Alette
K-Alette authored May 13, 2024
2 parents b79fae5 + 934d160 commit 5b57eb9
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 72 deletions.
Binary file modified code/reindexer/reindexer.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
}
Expand Down
14 changes: 7 additions & 7 deletions code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand Down
18 changes: 16 additions & 2 deletions sites/default/translation_maps/format_boost_map.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -69,6 +78,7 @@ Phonograph = 1
Photo = 1
Photonegative = 1
PhysicalObject = 1
Picture = 1
PlayStation = 3
PlayStation2 = 3
PlayStation3 = 3
Expand All @@ -81,6 +91,7 @@ PlayawayLaunchpad = 3
PlayawayView = 3
Pop-UpBook = 3
Print = 1
Realia = 1
SeedPacket = 1
SensorImage = 1
Serial = 3
Expand All @@ -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
Expand Down
135 changes: 74 additions & 61 deletions sites/default/translation_maps/format_category_map.properties
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -64,74 +72,79 @@ 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
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
Expand Down
Loading

0 comments on commit 5b57eb9

Please sign in to comment.