diff --git a/import/SolrMarc.jar b/import/SolrMarc.jar index 38233f2fccd3e2c83d788dddd5754e087f3bb918..6c6a47ce850bcbd2d0d68e293201834e3714b112 100644 Binary files a/import/SolrMarc.jar and b/import/SolrMarc.jar differ diff --git a/import/VuFindIndexer.jar b/import/VuFindIndexer.jar index 9453640fb9dd4a7a6b1a4193a51ab53594177d07..fc61f4468d31e8259277816d84f918982eda1bd8 100644 Binary files a/import/VuFindIndexer.jar and b/import/VuFindIndexer.jar differ diff --git a/import/index_scripts/dewey.bsh b/import/index_scripts/dewey.bsh index cad5c431b529a4b31cd54d68de3a201a6f8ca22e..0b1477ea18caa57984d9371440a375295a49326c 100644 --- a/import/index_scripts/dewey.bsh +++ b/import/index_scripts/dewey.bsh @@ -120,11 +120,11 @@ public String getDeweySortable(Record record, String fieldSpec) { * * @param record * @param fieldSpec - which MARC fields / subfields need to be analyzed - * @return Set containing normalized Dewey numbers extracted from specified fields. + * @return List containing normalized Dewey numbers extracted from specified fields. */ -public Set getDeweySortables(Record record, String fieldSpec) { +public List getDeweySortables(Record record, String fieldSpec) { // Initialize our return value: - Set result = new LinkedHashSet(); + List result = new LinkedList(); // Loop through the specified MARC fields: Set input = indexer.getFieldList(record, fieldSpec); diff --git a/import/marc.properties b/import/marc.properties index 4a1eaedff66db8a59ec3802bb0146e57ea50c33f..ecf981f530460d5dce490e4fa72cf572c753e6fe 100644 --- a/import/marc.properties +++ b/import/marc.properties @@ -36,9 +36,9 @@ title_sort = custom, getSortableTitle series = 440ap:800abcdfpqt:830ap series2 = 490a -publisher = script(getpublishers.bsh), getPublishers -publishDate = script(getdate.bsh), getDates -publishDateSort = script(getdate.bsh), getFirstDate +publisher = custom, getPublishers +publishDate = custom, getDates +publishDateSort = custom, getFirstDate physical = 300abcefg:530abcd dateSpan = 362a @@ -76,7 +76,7 @@ dewey-tens = custom, getDeweyNumber(082a:083a, 10), ddc22_map.properties(tens) dewey-ones = custom, getDeweyNumber(082a:083a, 1), ddc22_map.properties(ones) dewey-full = custom, getDeweySearchable(082a:083a) dewey-sort = custom, getDeweySortable(082a:083a) -dewey-sort-browse = script(dewey.bsh), getDeweySortables(082a:083a) +dewey-sort-browse = custom, getDeweySortables(082a:083a) dewey-raw = 082a:083a # Extract the numeric portion of the OCLC number using a pattern map: @@ -84,4 +84,4 @@ oclc_num = 035a, (pattern_map.oclc_num) pattern_map.oclc_num.pattern_0 = \\(OCoLC\\)[^0-9]*[0]*([0-9]+)=>$1 pattern_map.oclc_num.pattern_1 = ocm[0]*([0-9]+)[ ]*[0-9]*=>$1 pattern_map.oclc_num.pattern_2 = ocn[0]*([0-9]+).*=>$1 -pattern_map.oclc_num.pattern_3 = on[0]*([0-9]+).*=>$1 \ No newline at end of file +pattern_map.oclc_num.pattern_3 = on[0]*([0-9]+).*=>$1 diff --git a/import/translation_maps/language_map.properties b/import/translation_maps/language_map.properties index 4d84966833b624f70b2ceff21c71bf642d3d7db1..7c2c3cbaf26aeaa24692c61f9e226ea89a6eab3b 100644 --- a/import/translation_maps/language_map.properties +++ b/import/translation_maps/language_map.properties @@ -481,7 +481,7 @@ znd = Zande zul = Zulu zun = Zuni zza = Zaza -zxx = Music +zxx = No linguistic content ??? = Unknown mul = Multiple mis = Unknown \ No newline at end of file