Skip to content

Commit 1871a61

Browse files
author
DavidUnderdown
committed
updates to WO95Y15 schema for extra 100 pieces
1 parent 4950a32 commit 1871a61

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

example-schemas/WO95_scanning_list_Y15.csvs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ division: is("13")
1616
//this field must be precisely 13
1717
series: is("95")
1818
//Fixed value of 95 for this project
19-
sub_series: if($piece/range(572,1095),is("1"),if($piece/range(5289,5388),is("7"),is("6"))
19+
sub_series: if($piece/range(572,1095),is("1"),if($piece/range(5289,5388),is("7"),is("6")))
2020
//For the 2015-16 project material to be digitised is in sub_series 1 (France and Flanders) or 6 (Mesopotamia, Iraq and North Persia) or 7 (East Africa, Cameroon and West Africa)
21-
sub_sub_series: if($sub_series/is("1"),is("8") or range(10,14) or range(16,33),if($sub_series/is("6"),range(1,24),range(1,15) and not("7"))
21+
sub_sub_series: if($sub_series/is("1"),is("8") or range(10,14) or range(16,33),if($sub_series/is("6"),range(1,24),range(1,15) and not("7")))
2222
//As described in Appendix E of the ITT, the 1915-16 project is scanning material in sub_sub_series 8-33 (some numbers not used) for sub_series 1,
2323
//and sub_sub_series 1-24 for sub_series 6
24-
piece: range(572,1095) or range(4965,5288) or range(5289,5388) if($sub_series/is("1"),
25-
if($sub_sub_series/is("8"),range(572,587),if($sub_sub_series/is("10"),range(588,628),if($sub_sub_series/is("11"),range(629,667),if($sub_sub_series/is("12"),range(668,705),if($sub_sub_series/is("13"),range(706,742),if($sub_sub_series/is("14"),range(743,766),if($sub_sub_series/is("16"),range(767,803),if($sub_sub_series/is("17"),range(804,819),if($sub_sub_series/is("18"),range(820,834),if($sub_sub_series/is("19"),range(835,849),if($sub_sub_series/is("20"),range(850,879),if($sub_sub_series/is("21"),range(880,893),if($sub_sub_series/is("22"),is("894"),if($sub_sub_series/is("23"),range(895,909),if($sub_sub_series/is("24"),range(910,920),if($sub_sub_series/is("25"),range(921,933),if($sub_sub_series/is("26"),range(934,950),if($sub_sub_series/is("27"),range(951,958),if($sub_sub_series/is("28"),range(959,973),if($sub_sub_series/is("29"),range(974,979),if($sub_sub_series/is("30"),range(980,1031),if($sub_sub_series/is("31"),range(1032,1044),if($sub_sub_series/is("32"),range(1045,1087),range(1088,1095)))))))))))))))))))))))),
26-
if(if($sub_series/is("6"),$sub_sub_series/is("1"),range(4965,5008),if($sub_sub_series/is("2"),range(5009,5010),if($sub_sub_series/is("3"),range(5011,5012),if($sub_sub_series/is("4"),range(5013,5026),if($sub_sub_series/is("5"),range(5027,5031),if($sub_sub_series/is("6"),range(5032,5041),if($sub_sub_series/is("7"),range(5042,5044),if($sub_sub_series/is("8"),range(5045,5047),if($sub_sub_series/is("9"),range(5048,5051),if($sub_sub_series/is("10"),range(5052,5060),if($sub_sub_series/is("11"),range(5061,5081),if($sub_sub_series/is("12"),range(5082,5083),if($sub_sub_series/is("13"),range(5084,5093),if($sub_sub_series/is("14"),range(5094,5111),if($sub_sub_series/is("15"),range(5112,5126),if($sub_sub_series/is("16"),range(5127,5141),if($sub_sub_series/is("17"),range(5142,5146),if($sub_sub_series/is("18"),range(5147,5162),if($sub_sub_series/is("19"),range(5163,5181),if($sub_sub_series/is("20"),range(5182,5199),if($sub_sub_series/is("21"),range(5200,5214),if($sub_sub_series/is("22"),range(5215,5230),if($sub_sub_series/is("23"),range(5231,5284),
27-
if($sub_sub_series/is("1"),range(5289,5318),if($sub_sub_series/is("2"),range(5319,5322),if($sub_sub_series/is("3"),range(5323,5325),if($sub_sub_series/is("4"),is("5326"),if($sub_sub_series/is("5"),range(5327,5328),if($sub_sub_series/is("6"),range(5329,5332),if($sub_sub_series/is("8"),is("5333"),if($sub_sub_series/is("9"),is("5334"),if($sub_sub_series/is("10"),range(5335,5341),if($sub_sub_series/is("11"),range(5342,5345),if($sub_sub_series/is("12"),range(5346,5347),if($sub_sub_series/is("13"),range(5348,5380),if($sub_sub_series/is("14"),is("5381"),range(5382,5388)))))))))))))))))))))))))))))))))))))))
24+
piece: range(572,1095) or range(4965,5288) or range(5289,5388) if($sub_series/is("1"),if($sub_sub_series/is("8"),range(572,587),if($sub_sub_series/is("10"),range(588,628),if($sub_sub_series/is("11"),range(629,667),if($sub_sub_series/is("12"),range(668,705),if($sub_sub_series/is("13"),range(706,742),if($sub_sub_series/is("14"),range(743,766),if($sub_sub_series/is("16"),range(767,803),if($sub_sub_series/is("17"),range(804,819),if($sub_sub_series/is("18"),range(820,834),if($sub_sub_series/is("19"),range(835,849),if($sub_sub_series/is("20"),range(850,879),if($sub_sub_series/is("21"),range(880,893),if($sub_sub_series/is("22"),is("894"),if($sub_sub_series/is("23"),range(895,909),if($sub_sub_series/is("24"),range(910,920),if($sub_sub_series/is("25"),range(921,933),if($sub_sub_series/is("26"),range(934,950),if($sub_sub_series/is("27"),range(951,958),if($sub_sub_series/is("28"),range(959,973),if($sub_sub_series/is("29"),range(974,979),if($sub_sub_series/is("30"),range(980,1031),if($sub_sub_series/is("31"),range(1032,1044),if($sub_sub_series/is("32"),range(1045,1087),range(1088,1095)))))))))))))))))))))))),if($sub_series/is("6"),if($sub_sub_series/is("1"),range(4965,5008),if($sub_sub_series/is("2"),range(5009,5010),if($sub_sub_series/is("3"),range(5011,5012),if($sub_sub_series/is("4"),range(5013,5026),if($sub_sub_series/is("5"),range(5027,5031),if($sub_sub_series/is("6"),range(5032,5041),if($sub_sub_series/is("7"),range(5042,5044),if($sub_sub_series/is("8"),range(5045,5047),if($sub_sub_series/is("9"),range(5048,5051),if($sub_sub_series/is("10"),range(5052,5060),if($sub_sub_series/is("11"),range(5061,5081),if($sub_sub_series/is("12"),range(5082,5083),if($sub_sub_series/is("13"),range(5084,5093),if($sub_sub_series/is("14"),range(5094,5111),if($sub_sub_series/is("15"),range(5112,5126),if($sub_sub_series/is("16"),range(5127,5141),if($sub_sub_series/is("17"),range(5142,5146),if($sub_sub_series/is("18"),range(5147,5162),if($sub_sub_series/is("19"),range(5163,5181),if($sub_sub_series/is("20"),range(5182,5199),if($sub_sub_series/is("21"),range(5200,5214),if($sub_sub_series/is("22"),range(5215,5230),if($sub_sub_series/is("23"),range(5231,5284),if($sub_sub_series/is("1"),range(5289,5318),if($sub_sub_series/is("2"),range(5319,5322),if($sub_sub_series/is("3"),range(5323,5325),if($sub_sub_series/is("4"),is("5326"),if($sub_sub_series/is("5"),range(5327,5328),if($sub_sub_series/is("6"),range(5329,5332),if($sub_sub_series/is("8"),is("5333"),if($sub_sub_series/is("9"),is("5334"),if($sub_sub_series/is("10"),range(5335,5341),if($sub_sub_series/is("11"),range(5342,5345),if($sub_sub_series/is("12"),range(5346,5347),if($sub_sub_series/is("13"),range(5348,5380),if($sub_sub_series/is("14"),is("5381"),range(5382,5388)))))))))))))))))))))))))))))))))))))))
2825
//For this project there is a defined relationship between piece ranges as listed in Appendix E
2926
//This is encapsulated in this rather complex if,then,else statement
3027
item: range(1,21) or is("")

example-schemas/tech_acq_metadata_v1_WO95Y15B000.csvs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ division: is("13")
2525
series: is("95") and (in($file_path) and in($resource_uri))
2626
//Fixed value of 95 for this project
2727
//The value must also be part of the fields "file_path" and "resource_uri"
28-
sub_series: if($piece/range(572,1095),is("1"),is("6"))
29-
//For the 2015-16 project material to be digitised is in sub_series 1 (France and Flanders) or 6 (Mesopotamia, Iraq and North Persia)
30-
sub_sub_series: if($sub_series/is("1"),is("8") or range(10,14) or range(16,33),range(1,24))
28+
sub_series: if($piece/range(572,1095),is("1"),if($piece/range(5289,5388),is("7"),is("6")))
29+
//For the 2015-16 project material to be digitised is in sub_series 1 (France and Flanders) or 6 (Mesopotamia, Iraq and North Persia) or 7 (East Africa, Cameroon and West Africa)
30+
sub_sub_series: if($sub_series/is("1"),is("8") or range(10,14) or range(16,33),if($sub_series/is("6"),range(1,24),range(1,15) and not("7")))
3131
//As described in Appendix E of the ITT, the 1915-16 project is scanning material in sub_sub_series 8-33 (some numbers not used) for sub_series 1,
3232
//and sub_sub_series 1-24 for sub_series 6
33-
piece: range(572,1095) or range(4965,5288) //if($sub_series/is("1"),if($sub_sub_series/is("8"),range(572,587),if($sub_sub_series/is("10"),range(588,628),if($sub_sub_series/is("11"),range(629,667),if($sub_sub_series/is("12"),range(668,705),if($sub_sub_series/is("13"),range(706,742),if($sub_sub_series/is("14"),range(743,766),if($sub_sub_series/is("16"),range(767,803),if($sub_sub_series/is("17"),range(804,819),if($sub_sub_series/is("18"),range(820,834),if($sub_sub_series/is("19"),range(835,849),if($sub_sub_series/is("20"),range(850,879),if($sub_sub_series/is("21"),range(880,893),if($sub_sub_series/is("22"),is("894"),if($sub_sub_series/is("23"),range(895,909),if($sub_sub_series/is("24"),range(910,920),if($sub_sub_series/is("25"),range(921,933),if($sub_sub_series/is("26"),range(934,950),if($sub_sub_series/is("27"),range(951,958),if($sub_sub_series/is("28"),range(959,973),if($sub_sub_series/is("29"),range(974,979),if($sub_sub_series/is("30"),range(980,1031),if($sub_sub_series/is("31"),range(1032,1044),if($sub_sub_series/is("32"),range(1045,1087),range(1088,1095)))))))))))))))))))))))),if($sub_sub_series/is("1"),range(4965,5008),if($sub_sub_series/is("2"),range(5009,5010),if($sub_sub_series/is("3"),range(5011,5012),if($sub_sub_series/is("4"),range(5013,5026),if($sub_sub_series/is("5"),range(5027,5031),if($sub_sub_series/is("6"),range(5032,5041),if($sub_sub_series/is("7"),range(5042,5044),if($sub_sub_series/is("8"),range(5045,5047),if($sub_sub_series/is("9"),range(5048,5051),if($sub_sub_series/is("10"),range(5052,5060),if($sub_sub_series/is("11"),range(5061,5081),if($sub_sub_series/is("12"),range(5082,5083),if($sub_sub_series/is("13"),range(5084,5093),if($sub_sub_series/is("14"),range(5094,5111),if($sub_sub_series/is("15"),range(5112,5126),if($sub_sub_series/is("16"),range(5127,5141),if($sub_sub_series/is("17"),range(5142,5146),if($sub_sub_series/is("18"),range(5147,5162),if($sub_sub_series/is("19"),range(5163,5181),if($sub_sub_series/is("20"),range(5182,5199),if($sub_sub_series/is("21"),range(5200,5214),if($sub_sub_series/is("22"),range(5215,5230),if($sub_sub_series/is("23"),range(5231,5284),range(5285,5288))))))))))))))))))))))))) and (in($file_path) and in($resource_uri))
33+
piece: range(572,1095) or range(4965,5288) or range(5289,5388) //if($sub_series/is("1"),if($sub_sub_series/is("8"),range(572,587),if($sub_sub_series/is("10"),range(588,628),if($sub_sub_series/is("11"),range(629,667),if($sub_sub_series/is("12"),range(668,705),if($sub_sub_series/is("13"),range(706,742),if($sub_sub_series/is("14"),range(743,766),if($sub_sub_series/is("16"),range(767,803),if($sub_sub_series/is("17"),range(804,819),if($sub_sub_series/is("18"),range(820,834),if($sub_sub_series/is("19"),range(835,849),if($sub_sub_series/is("20"),range(850,879),if($sub_sub_series/is("21"),range(880,893),if($sub_sub_series/is("22"),is("894"),if($sub_sub_series/is("23"),range(895,909),if($sub_sub_series/is("24"),range(910,920),if($sub_sub_series/is("25"),range(921,933),if($sub_sub_series/is("26"),range(934,950),if($sub_sub_series/is("27"),range(951,958),if($sub_sub_series/is("28"),range(959,973),if($sub_sub_series/is("29"),range(974,979),if($sub_sub_series/is("30"),range(980,1031),if($sub_sub_series/is("31"),range(1032,1044),if($sub_sub_series/is("32"),range(1045,1087),range(1088,1095)))))))))))))))))))))))),if($sub_series/is("6"),if($sub_sub_series/is("1"),range(4965,5008),if($sub_sub_series/is("2"),range(5009,5010),if($sub_sub_series/is("3"),range(5011,5012),if($sub_sub_series/is("4"),range(5013,5026),if($sub_sub_series/is("5"),range(5027,5031),if($sub_sub_series/is("6"),range(5032,5041),if($sub_sub_series/is("7"),range(5042,5044),if($sub_sub_series/is("8"),range(5045,5047),if($sub_sub_series/is("9"),range(5048,5051),if($sub_sub_series/is("10"),range(5052,5060),if($sub_sub_series/is("11"),range(5061,5081),if($sub_sub_series/is("12"),range(5082,5083),if($sub_sub_series/is("13"),range(5084,5093),if($sub_sub_series/is("14"),range(5094,5111),if($sub_sub_series/is("15"),range(5112,5126),if($sub_sub_series/is("16"),range(5127,5141),if($sub_sub_series/is("17"),range(5142,5146),if($sub_sub_series/is("18"),range(5147,5162),if($sub_sub_series/is("19"),range(5163,5181),if($sub_sub_series/is("20"),range(5182,5199),if($sub_sub_series/is("21"),range(5200,5214),if($sub_sub_series/is("22"),range(5215,5230),if($sub_sub_series/is("23"),range(5231,5284),if($sub_sub_series/is("1"),range(5289,5318),if($sub_sub_series/is("2"),range(5319,5322),if($sub_sub_series/is("3"),range(5323,5325),if($sub_sub_series/is("4"),is("5326"),if($sub_sub_series/is("5"),range(5327,5328),if($sub_sub_series/is("6"),range(5329,5332),if($sub_sub_series/is("8"),is("5333"),if($sub_sub_series/is("9"),is("5334"),if($sub_sub_series/is("10"),range(5335,5341),if($sub_sub_series/is("11"),range(5342,5345),if($sub_sub_series/is("12"),range(5346,5347),if($sub_sub_series/is("13"),range(5348,5380),if($sub_sub_series/is("14"),is("5381"),range(5382,5388)))))))))))))))))))))))))))))))))))))))
3434
//For this project there is a defined relationship between piece ranges as listed in Appendix E
35-
//This is encapsulated in this rather complex if,then,else statement - this unfortunately seems to be causing the validator to hang, so has been replaced with a simpler, but less
36-
//comprehensive check for now.
37-
//The value must also be part of the fields "file_path" and "resource_uri"
35+
//This is encapsulated in this rather complex if,then,else statement
3836
item: (range(1,21) and in($file_path)) or is("")
3937
//Most pieces are subdivided into items, there are not expected to be more than 10 per piece
4038
//The value must also be part of the fields "file_path" and "resource_uri"

0 commit comments

Comments
 (0)