Skip to content

Commit ff90734

Browse files
AlexanderBlanchardACAlexanderBlanchardAC
authored
Merge branch 'Aspen-Discovery:24.05.00' into summon_new_features_24.06.00
2 parents dbe77f7 + 4ae3341 commit ff90734

File tree

13 files changed

+147
-92
lines changed

13 files changed

+147
-92
lines changed

‎code/events_indexer/events_indexer.jar

8 Bytes
Binary file not shown.

‎code/events_indexer/src/com/turning_leaf_technologies/events/AssabetIndexer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void indexEvents() {
197197

198198
//get event type with location_virtual value
199199
String eventType = getStringForKey(locationsForCurEvent, "location_virtual");
200-
if (eventType != null && eventType.equals("1")){
200+
if (eventType != null && eventType.equals("0")){
201201
eventType = "In Person";
202202
}else {
203203
eventType = "Online";

‎code/reindexer/reindexer.jar

-35 Bytes
Binary file not shown.

‎code/reindexer/src/org/aspen_discovery/format_classification/IIIRecordFormatClassifier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public LinkedHashSet<String> getUntranslatedFormatsFromBib(org.marc4j.marc.Recor
2727
if (matTypeSubfield != null) {
2828
String formatValue = matTypeSubfield.getData().trim();
2929
if (indexingProfile.hasTranslation("format", formatValue)) {
30-
formats.add(indexingProfile.translateValue("format", formatValue));
30+
formats.add(formatValue);
3131

3232
}
3333
}

‎code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -734,13 +734,13 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
734734
formatCode = fixedField008.getData().toUpperCase().charAt(26);
735735
switch (formatCode) {
736736
case 'A':
737-
result.add("Numeric Data");
737+
result.add("NumericData");
738738
break;
739739
case 'B':
740-
result.add("Computer Program");
740+
result.add("ComputerProgram");
741741
break;
742742
case 'G':
743-
result.add("Video Game");
743+
result.add("VideoGame");
744744
break;
745745
default:
746746
result.add("Electronic");
@@ -757,7 +757,7 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
757757
formatCode = fixedField008.getData().toUpperCase().charAt(33);
758758
switch (formatCode) {
759759
case 'A':
760-
result.add("Art Original");
760+
result.add("ArtOriginal");
761761
break;
762762
case 'B':
763763
result.add("Kit");
@@ -781,16 +781,16 @@ public void getFormatFromLeader(Set<String> result, String leader, ControlField
781781
result.add("Graphic");
782782
break;
783783
case 'L':
784-
result.add("Technical Drawing");
784+
result.add("TechnicalDrawing");
785785
break;
786786
case 'N':
787787
result.add("Chart");
788788
break;
789789
case 'O':
790-
result.add("Flash card");
790+
result.add("Flashcard");
791791
break;
792792
case 'P':
793-
result.add("Microscope Slide");
793+
result.add("MicroscopeSlide");
794794
break;
795795
case 'Q':
796796
result.add("Model");

‎code/web/services/MyAccount/ContactInformation.php

+16-11
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,23 @@ function launch() {
8181
$zip = '';
8282

8383
//get the correct _REQUEST names as they differ across ILSes
84-
foreach ($_REQUEST as $selfRegValue => $val) {
85-
if (preg_match('/(.*?)address|street(.*)/', $selfRegValue)) {
86-
$streetAddress = $val;
87-
} elseif (preg_match('/(.*?)city(.*)/', $selfRegValue)) {
88-
$city = $val;
89-
} elseif (preg_match('/(.*?)state(.*)/', $selfRegValue)) {
90-
//USPS does not accept anything other than 2 character state codes but will use the ZIP to fill in the blank
91-
if (strlen($val) == 2) {
92-
$state = $val;
84+
foreach ($_REQUEST as $contactInfoValue => $val){
85+
if (!(preg_match('/(.*?)address2(.*)|(.*?)borrower_B(.*)|(.*?)borrower_alt(.*)/', $contactInfoValue))){
86+
if (preg_match('/(.*?)address|street(.*)/', $contactInfoValue)){
87+
$streetAddress = $val;
88+
}
89+
elseif (preg_match('/(.*?)city(.*)/', $contactInfoValue)){
90+
$city = $val;
91+
}
92+
elseif (preg_match('/(.*?)state(.*)/', $contactInfoValue)){
93+
//USPS does not accept anything other than 2 character state codes but will use the ZIP to fill in the blank
94+
if (strlen($val) == 2){
95+
$state = $val;
96+
}
97+
}
98+
elseif (preg_match('/(.*?)zip(.*)/', $contactInfoValue)){
99+
$zip = $val;
93100
}
94-
} elseif (preg_match('/(.*?)zip(.*)/', $selfRegValue)) {
95-
$zip = $val;
96101
}
97102
}
98103
require_once ROOT_DIR . '/sys/Utils/SystemUtils.php';

‎code/web/services/PalaceProject/Collections.php

+12
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,18 @@ function canAddNew() {
5959
return true;
6060
}
6161

62+
function canBatchEdit() {
63+
return false;
64+
}
65+
66+
function canEdit(DataObject $object) {
67+
return false;
68+
}
69+
70+
function canEditList() {
71+
return false;
72+
}
73+
6274
function canDelete() {
6375
return true;
6476
}

‎code/web/sys/Account/User.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -3683,13 +3683,13 @@ public function getAdminActions() {
36833683
$sections['palace_project'] = new AdminSection('Palace Project');
36843684
$palaceProjectSettingsAction = new AdminAction('Settings', 'Define connection information between Palace Project and Aspen Discovery.', '/PalaceProject/Settings');
36853685
$palaceProjectScopesAction = new AdminAction('Scopes', 'Define which records are loaded for each library and location.', '/PalaceProject/Scopes');
3686-
$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
3686+
//$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
36873687
if ($sections['palace_project']->addAction($palaceProjectSettingsAction, 'Administer Palace Project')) {
36883688
$palaceProjectSettingsAction->addSubAction($palaceProjectScopesAction, 'Administer Palace Project');
3689-
$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
3689+
//$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
36903690
} else {
36913691
$sections['palace_project']->addAction($palaceProjectScopesAction, 'Administer Palace Project');
3692-
$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
3692+
//$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
36933693
}
36943694
$sections['palace_project']->addAction(new AdminAction('Indexing Log', 'View the indexing log for Palace Project.', '/PalaceProject/IndexingLog'), [
36953695
'View System Reports',

‎code/web/sys/PalaceProject/PalaceProjectCollection.php

-4
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,4 @@ public static function getObjectStructure($context = ''): array {
8383
];
8484
return $structure;
8585
}
86-
87-
public function getEditLink($context): string {
88-
return '/PalaceProject/Collections?objectAction=edit&id=' . $this->id;
89-
}
9086
}

‎code/web/sys/PalaceProject/PalaceProjectSetting.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static function getObjectStructure($context = ''): array {
108108
'sortable' => false,
109109
'storeDb' => true,
110110
'allowEdit' => true,
111-
'canEdit' => true,
111+
'canEdit' => false,
112112
'canAddNew' => false,
113113
'canDelete' => false,
114114
'additionalOneToManyActions' => [],

‎sites/default/translation_maps/format_boost_map.properties

+16-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
4K/Blu-ray = 12
55
Adobe_EPUB_eBook = 9
66
Adobe_PDF_eBook = 3
7+
ArtOriginal = 1
78
Atlas = 1
9+
Bingepass = 1
810
Blu-ray = 12
911
Blu-ray/DVD = 12
1012
BoardBook = 3
@@ -16,12 +18,14 @@ BookClubKit = 1
1618
BookClubKitLarge = 1
1719
Braille = 1
1820
CDROM = 1
21+
CD+DVD = 3
22+
CD+Book = 3
1923
Chart = 1
2024
ChipCartridge = 1
2125
Collage = 1
2226
CompactDisc = 3
23-
CD+DVD = 3
24-
CD+Book = 3
27+
ComputerProgram = 1
28+
Diorama = 1
2529
DVD = 12
2630
DiscCartridge = 1
2731
Disney_Online_Book = 3
@@ -30,9 +34,11 @@ Electronic = 1
3034
Filmstrip = 1
3135
FlashCard = 1
3236
FloppyDisk = 1
37+
Game = 1
3338
GameCube = 3
3439
Globe = 1
3540
GoReader = 1
41+
Graphic = 1
3642
GraphicNovel = 9
3743
Journal = 3
3844
Kindle_Book = 9
@@ -43,8 +49,10 @@ LibraryOfThings = 3
4349
Manuscript = 1
4450
Map = 1
4551
Microfilm = 1
52+
MicroscopeSlide = 1
4653
Microsoft_eBook = 9
4754
Mobipocket_eBook = 1
55+
Model = 1
4856
MotionPicture = 1
4957
MP3Disc = 3
5058
MusicCassette = 1
@@ -55,6 +63,7 @@ NOOK_Periodical = 3
5563
Newspaper = 3
5664
NintendoDS = 3
5765
NintendoSwitch = 3
66+
NumericData = 1
5867
Open_EPUB_eBook = 9
5968
Open_PDF_eBook = 3
6069
OverDrive_Listen = 9
@@ -69,6 +78,7 @@ Phonograph = 1
6978
Photo = 1
7079
Photonegative = 1
7180
PhysicalObject = 1
81+
Picture = 1
7282
PlayStation = 3
7383
PlayStation2 = 3
7484
PlayStation3 = 3
@@ -81,6 +91,7 @@ PlayawayLaunchpad = 3
8191
PlayawayView = 3
8292
Pop-UpBook = 3
8393
Print = 1
94+
Realia = 1
8495
SeedPacket = 1
8596
SensorImage = 1
8697
Serial = 3
@@ -94,14 +105,17 @@ TapeCartridge = 1
94105
TapeCassette = 1
95106
TapeRecording = 1
96107
TapeReel = 1
108+
TechnicalDrawing = 1
97109
Thesis = 1
110+
Toy = 1
98111
Transparency = 1
99112
Unknown = 1
100113
VerticalFile = 1
101114
Video = 1
102115
VideoCartridge = 1
103116
VideoCassette = 3
104117
VideoDisc = 12
118+
VideoGame = 1
105119
VideoReel = 1
106120
VoxBooks = 3
107121
Web_Content = 9

0 commit comments

Comments
 (0)