Skip to content

Commit 03b7d86

Browse files
committed
Update runner examples #651
1 parent 2ca72b8 commit 03b7d86

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

metafacture-runner/src/main/dist/examples/beacon/create/extract.fix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# 002@ not repeatable
22

3-
if any_match("[email protected]", "^Tp.*$")
3+
if any_match("[email protected]", "^Tp.$")
44
copy_field("[email protected]","ok")
55
end
66

77
# DBSM:
8-
# (006U $0 “04p01*”) or (017A $a “yy”)
9-
if any_match("006U.0","04p01.*")
8+
# (006U $0 “04p01”) or (017A $a “yy”)
9+
if any_match("006U.0","04p01.")
1010
add_field("@value","DBSM|ALL")
1111
elsif any_equal("017A.a","yy")
1212
add_field("@value","DBSM|ALL")
@@ -19,12 +19,12 @@ elsif any_equal("209A.f","HB/EB")
1919
add_field("@value","DEA|ALL")
2020

2121
# DMA:
22-
# (002@ $0 “G*” or 002@ $0 “M*”) or (006U $0 “10,P01*”)
22+
# (002@ $0 “G” or 002@ $0 “M”) or (006U $0 “10,P01”)
2323

24-
elsif any_equal("[email protected]","^[GM].*")
24+
elsif any_equal("[email protected]","^[GM].")
2525
add_field("@value","DMA|ALL")
2626

27-
elsif any_equal("006U.0","^10,P01.*")
27+
elsif any_equal("006U.0","^10,P01.")
2828
add_field("@value","DMA|ALL")
2929
else
3030
add_field("@value","ALL")
@@ -38,13 +38,13 @@ else
3838
remove_field("@value")
3939
end
4040

41-
do list(path: "041A*|028A*|029B*|028C*|028Q*|028P*|028F*|028M*|028D*|028E*", "var":"$i")
41+
do list(path: "041A|028A|029B|028C|028Q|028P|028F|028M|028D|028E", "var":"$i")
4242
trim("$i.9")
4343
to_var("$i.9","ref")
4444
if exists("$i.9")
4545
copy_field("@value","{to:$[ref]}refed")
4646
end
4747
end
4848

49-
retain("{to*","ok")
49+
retain("{to","ok")
5050

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
do list(path:"041A*|041A","var":"$i") # Until https://github.com/metafacture/metafacture-core/issues/651 is fixed one hass to add "041A"
1+
do list(path:"041A","var":"$i")
22
copy_field("$i.9","relevantField.$append")
33
end
44

5-
trim("relevantField.*")
5+
trim("relevantField.")
66
uniq("relevantField")
77

88
retain("relevantField")

metafacture-runner/src/main/dist/examples/gnd/crisscross-connections/extract.fix

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ do put_macro("gndPersonCombinedLabel") # in contrast to morph this is not normal
88
copy_field("$[field].l","$[field].add.$append")
99
copy_field("$[field].g","$[field].add.$append")
1010
join_field("$[field].add",", ")
11-
replace_all("$[field].add","^(.*)$"," <$1>")
11+
replace_all("$[field].add","^(.)$"," <$1>")
1212
if exists("$[field].add")
1313
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
1414
end
@@ -21,7 +21,7 @@ do put_macro("gndCorporationCombinedLabel") # in contrast to morph this is not n
2121
copy_field("$[field].l","$[field].add.$append")
2222
copy_field("$[field].g","$[field].add.$append")
2323
join_field("$[field].add",", ")
24-
replace_all("$[field].add","^(.*)$"," <$1>")
24+
replace_all("$[field].add","^(.)$"," <$1>")
2525
copy_field("$[field].a","$[field].@combinedLabel")
2626
if exists("$[field].add")
2727
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
@@ -40,7 +40,7 @@ do put_macro("gndConferenceCombinedLabel") # in contrast to morph this is not no
4040
copy_field("$[field].d","$[field].add.$append")
4141
copy_field("$[field].c","$[field].add.$append")
4242
join_field("$[field].add",", ")
43-
replace_all("$[field].add","^(.*)$"," <$1>")
43+
replace_all("$[field].add","^(.)$"," <$1>")
4444
if exists("$[field].b")
4545
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].b", join_char:"")
4646
else
@@ -59,7 +59,7 @@ do put_macro("gndGeolocationCombinedLabel") # in contrast to morph this is not n
5959
copy_field("$[field].z","$[field].add.$append")
6060
copy_field("$[field].g","$[field].add.$append")
6161
join_field("$[field].add",", ")
62-
replace_all("$[field].add","^(.*)$"," <$1>")
62+
replace_all("$[field].add","^(.)$"," <$1>")
6363
if exists("$[field].b")
6464
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].x", join_char:"")
6565
else
@@ -76,7 +76,7 @@ do put_macro("gndSubjectCombinedLabel") # in contrast to morph this is not norma
7676
if any_equal("@type","s")
7777
copy_field("$[field].g","$[field].add.$append")
7878
join_field("$[field].add",", ")
79-
replace_all("$[field].add","^(.*)$"," <$1>")
79+
replace_all("$[field].add","^(.)$"," <$1>")
8080
copy_field("$[field].a","$[field].@combinedLabel")
8181
if exists("$[field].add")
8282
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
@@ -91,7 +91,7 @@ do put_macro("gndWorkCombinedLabel") # in contrast to morph this is not normaliz
9191
copy_field("$[field].g","$[field].add.$append")
9292
copy_field("$[field].n","$[field].add.$append")
9393
join_field("$[field].add",", ")
94-
replace_all("$[field].add","^(.*)$"," <$1>")
94+
replace_all("$[field].add","^(.)$"," <$1>")
9595
if exists("$[field].p")
9696
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].p", join_char:"")
9797
else
@@ -156,7 +156,7 @@ end
156156

157157
# copy_field("008A.a","teilbest")
158158

159-
do list(path:"041A*|041A","var":"$i") # Until https://github.com/metafacture/metafacture-core/issues/651 is fixed one hass to add "041A"
159+
do list(path:"041A","var":"$i")
160160
trim("$i.9")
161161
to_var("$i.9","ref")
162162
if exists("$i.9")
@@ -177,7 +177,7 @@ do list(path:"042A", "var":"$i")
177177
copy_field("$a","gnd.sys.$append")
178178
end
179179
end
180-
replace_all("gnd.sys.*",";",",")
180+
replace_all("gnd.sys.",";",",")
181181
join_field("gnd.sys"," | ")
182182
unless exists("gnd.sys")
183183
add_field("gnd.sys","")
@@ -213,4 +213,4 @@ unless exists("037G.c")
213213
end
214214

215215

216-
retain("{to*","gnd","filter*","@*")
216+
retain("{to","gnd","filter","@")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
do list(path:"041A*|041A","var":"$i") # Until issue #651 is fixed one has to add "041A"
1+
do list(path:"041A","var":"$i")
22
copy_field("$i.9","relevantField.$append")
33
end
44

5-
trim("relevantField.*")
5+
trim("relevantField.")
66
uniq("relevantField")
77

88
retain("relevantField")

metafacture-runner/src/main/dist/examples/gnd/references2/extract.fix

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ do put_macro("gndPersonCombinedLabel") # in contrast to morph this is not normal
88
copy_field("$[field].l","$[field].add.$append")
99
copy_field("$[field].g","$[field].add.$append")
1010
join_field("$[field].add",", ")
11-
replace_all("$[field].add","^(.*)$"," <$1>")
11+
replace_all("$[field].add","^(.)$"," <$1>")
1212
if exists("$[field].add")
1313
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
1414
end
@@ -21,7 +21,7 @@ do put_macro("gndCorporationCombinedLabel") # in contrast to morph this is not n
2121
copy_field("$[field].l","$[field].add.$append")
2222
copy_field("$[field].g","$[field].add.$append")
2323
join_field("$[field].add",", ")
24-
replace_all("$[field].add","^(.*)$"," <$1>")
24+
replace_all("$[field].add","^(.)$"," <$1>")
2525
copy_field("$[field].a","$[field].@combinedLabel")
2626
if exists("$[field].add")
2727
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
@@ -40,7 +40,7 @@ do put_macro("gndConferenceCombinedLabel") # in contrast to morph this is not no
4040
copy_field("$[field].d","$[field].add.$append")
4141
copy_field("$[field].c","$[field].add.$append")
4242
join_field("$[field].add",", ")
43-
replace_all("$[field].add","^(.*)$"," <$1>")
43+
replace_all("$[field].add","^(.)$"," <$1>")
4444
if exists("$[field].b")
4545
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].b", join_char:"")
4646
else
@@ -59,7 +59,7 @@ do put_macro("gndGeolocationCombinedLabel") # in contrast to morph this is not n
5959
copy_field("$[field].z","$[field].add.$append")
6060
copy_field("$[field].g","$[field].add.$append")
6161
join_field("$[field].add",", ")
62-
replace_all("$[field].add","^(.*)$"," <$1>")
62+
replace_all("$[field].add","^(.)$"," <$1>")
6363
if exists("$[field].b")
6464
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].x", join_char:"")
6565
else
@@ -76,7 +76,7 @@ do put_macro("gndSubjectCombinedLabel") # in contrast to morph this is not norma
7676
if any_equal("@type","s")
7777
copy_field("$[field].g","$[field].add.$append")
7878
join_field("$[field].add",", ")
79-
replace_all("$[field].add","^(.*)$"," <$1>")
79+
replace_all("$[field].add","^(.)$"," <$1>")
8080
copy_field("$[field].a","$[field].@combinedLabel")
8181
if exists("$[field].add")
8282
paste("$[field].@combinedLabel", "$[field].@combinedLabel", "$[field].add", join_char:"")
@@ -91,7 +91,7 @@ do put_macro("gndWorkCombinedLabel") # in contrast to morph this is not normaliz
9191
copy_field("$[field].g","$[field].add.$append")
9292
copy_field("$[field].n","$[field].add.$append")
9393
join_field("$[field].add",", ")
94-
replace_all("$[field].add","^(.*)$"," <$1>")
94+
replace_all("$[field].add","^(.)$"," <$1>")
9595
if exists("$[field].p")
9696
paste("$[field].@combinedLabel", "$[field].a", "~ / ", "$[field].p", join_char:"")
9797
else
@@ -156,7 +156,7 @@ end
156156

157157
# copy_field("008A.a","teilbest")
158158

159-
do list(path:"041A*|041A","var":"$i") # Until https://github.com/metafacture/metafacture-core/issues/651 is fixed one hass to add "041A"
159+
do list(path:"041A","var":"$i")
160160
trim("$i.9")
161161
to_var("$i.9","ref")
162162
if exists("$i.9")
@@ -177,7 +177,7 @@ do list(path:"042A", "var":"$i")
177177
copy_field("$a","gnd.sys.$append")
178178
end
179179
end
180-
replace_all("gnd.sys.*",";",",")
180+
replace_all("gnd.sys.",";",",")
181181
join_field("gnd.sys"," | ")
182182
unless exists("gnd.sys")
183183
add_field("gnd.sys","")
@@ -213,4 +213,4 @@ unless exists("037G.c")
213213
end
214214

215215

216-
retain("{to*","gnd","filter*","@*")
216+
retain("{to","gnd","filter","@")

0 commit comments

Comments
 (0)