Skip to content
This repository has been archived by the owner on May 9, 2024. It is now read-only.

WIP: Add SFA preprocessing #4

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8d10f35
Add SFA preprocessing
Nov 8, 2023
bc13bcd
wip
DanielCosme Nov 9, 2023
ad1f067
Compress testdata SIP and move it to sampledata
jraddaoui Nov 9, 2023
1a1b0c9
Fix package extraction
jraddaoui Nov 9, 2023
2dcd7db
Install python, pip and lxml in enduro-a3m-worker
jraddaoui Nov 9, 2023
be0e144
Preprocessing works
Nov 10, 2023
8fff43c
Clean up files
DanielCosme Nov 10, 2023
203f2d2
Update am processing workflow test
DanielCosme Nov 14, 2023
95adce0
Fix am pre-processing
DanielCosme Nov 16, 2023
ab6356b
wip
DanielCosme Nov 16, 2023
833d32e
Create bag-info.txt when repackaging SiP
DanielCosme Nov 27, 2023
3a0c322
Send failed packages to "Failed" minIO bucket
DanielCosme Nov 27, 2023
3539373
Send failed SIPs to a different bucket.
DanielCosme Nov 27, 2023
f2aa30f
Fix conflict solving issue
jraddaoui Dec 1, 2023
0a8e49d
Run go mod download
jraddaoui Dec 1, 2023
a40d86a
Fix line endings
jraddaoui Dec 1, 2023
ba8ff42
Use gotest.tools/v3
jraddaoui Dec 1, 2023
97834d9
Ignore gosec G204
jraddaoui Dec 1, 2023
00b4a6b
Fix linting issues
jraddaoui Dec 1, 2023
50bfef2
Clean path before open
jraddaoui Dec 1, 2023
64beeb5
Fix tests
jraddaoui Dec 1, 2023
b0918d1
Skip bundle activity
jraddaoui Dec 1, 2023
cd23ac8
Change AM transfer type
jraddaoui Dec 1, 2023
06b3280
Undo modification to bundle activity
jraddaoui Dec 1, 2023
67c42b7
Unify Dockerfile diffs
jraddaoui Dec 1, 2023
db120a1
Fix AM start transfer tests
jraddaoui Dec 1, 2023
7dbf915
Move fformat package inside sfa folder
jraddaoui Dec 1, 2023
1abccfb
Rename sfa activities files
jraddaoui Dec 1, 2023
3803376
Move bucket setup and act. registration to sfa pkg
jraddaoui Dec 1, 2023
d3efa11
Move SFA activities execution to sfa package
jraddaoui Dec 1, 2023
9e33004
Use gocloud.dev/blob/memblob in test
jraddaoui Dec 1, 2023
79d63b5
Add test util functions to sfa package
jraddaoui Dec 1, 2023
607d17e
Undo unnecessary expectation change
jraddaoui Dec 1, 2023
05a169c
Tweak SFA activities options
jraddaoui Dec 4, 2023
9931f9c
Increase upload buffer size in send to failed
jraddaoui Dec 4, 2023
593f25e
Remove temporary files created in SFA prep
jraddaoui Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
!go.mod
!go.sum
!main.go
!hack/sampledata/xsd
8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ COPY --from=build-enduro-a3m-worker --link /src/enduro.toml /home/enduro/.config
CMD ["/home/enduro/bin/enduro-a3m-worker", "--config", "/home/enduro/.config/enduro.toml"]

FROM base AS enduro-am-worker
ENV PYTHONUNBUFFERED=1
USER root
RUN apk add --update --no-cache python3 && \
ln -sf python3 /usr/bin/python && \
python3 -m ensurepip
USER enduro
RUN pip3 install --no-cache --upgrade pip lxml bagit==v1.8.1
COPY --from=build-enduro-am-worker --link /src/hack/sampledata/xsd/* /
COPY --from=build-enduro-am-worker --link /out/enduro-am-worker /home/enduro/bin/enduro-am-worker
COPY --from=build-enduro-am-worker --link /src/enduro.toml /home/enduro/.config/enduro.toml
CMD ["/home/enduro/bin/enduro-am-worker", "--config", "/home/enduro/.config/enduro.toml"]
Expand Down
7 changes: 7 additions & 0 deletions cmd/enduro-am-worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/artefactual-sdps/enduro/internal/am"
"github.com/artefactual-sdps/enduro/internal/config"
"github.com/artefactual-sdps/enduro/internal/db"
"github.com/artefactual-sdps/enduro/internal/sfa"
"github.com/artefactual-sdps/enduro/internal/sftp"
"github.com/artefactual-sdps/enduro/internal/temporal"
"github.com/artefactual-sdps/enduro/internal/version"
Expand Down Expand Up @@ -158,6 +159,12 @@ func main() {
temporalsdk_activity.RegisterOptions{Name: activities.CleanUpActivityName},
)

// SFA-preprocessing activities.
if err := sfa.RegisterActivities(ctx, w, cfg); err != nil {
logger.Error(err, "Error setting up SFA preprocessing activities.")
os.Exit(1)
}

g.Add(
func() error {
if err := w.Start(); err != nil {
Expand Down
16 changes: 16 additions & 0 deletions enduro.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,22 @@ secret = "minio123"
region = "us-west-1"
bucket = "aips"

[failedtransfers]
endpoint = "http://minio.enduro-sdps:9000"
pathStyle = true
key = "minio"
secret = "minio123"
region = "us-west-1"
bucket = "failed-transfers"

[failedsips]
endpoint = "http://minio.enduro-sdps:9000"
pathStyle = true
key = "minio"
secret = "minio123"
region = "us-west-1"
bucket = "failed-sips"

# Change the taskqueue setting to your prefered preservation system, by default it is a3m.
[preservation]
taskqueue = "a3m"
Expand Down
9 changes: 9 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ require (
github.com/prometheus/client_golang v1.17.0
github.com/radovskyb/watcher v1.0.7
github.com/redis/go-redis/v9 v9.2.1
github.com/richardlehane/siegfried v1.10.1
github.com/rukavina/sftpblob v0.0.0-20201030103652-e8e9601e6511
github.com/spf13/afero v1.10.0
github.com/spf13/pflag v1.0.5
Expand Down Expand Up @@ -124,7 +125,14 @@ require (
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/richardlehane/characterize v1.0.0 // indirect
github.com/richardlehane/match v1.0.5 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect
github.com/richardlehane/xmldetect v1.0.2 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/ross-spencer/spargo v0.4.1 // indirect
github.com/ross-spencer/wikiprov v0.2.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
Expand All @@ -143,6 +151,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/image v0.6.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
Expand Down
19 changes: 19 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,19 @@ github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6Qml
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/richardlehane/characterize v1.0.0 h1:2MMnKFqYd+hsKpQrPkc5JjbcIzVBIfvSoaMd563GOj0=
github.com/richardlehane/characterize v1.0.0/go.mod h1:9mhxzxtWkXoLQpkg+gt7ioK6//+3hrsv3VHkbj8kbuQ=
github.com/richardlehane/match v1.0.5 h1:+tuXp28xaIPsvKbhHyuivce9qMEfE8nP9d0wSxJef9o=
github.com/richardlehane/match v1.0.5/go.mod h1:Vz0T28BYeZrU9h54iHnyjDfhVlKvn7XB7smnVripJME=
github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
github.com/richardlehane/siegfried v1.10.1 h1:JqnNfZ9jVhAMQARWmsb1K5Bcsa618dXldUjbEdFoz/c=
github.com/richardlehane/siegfried v1.10.1/go.mod h1:yFfhG6inB1rHc+zow4rEkcEoAPCiv0cqCPwb35g7xSc=
github.com/richardlehane/xmldetect v1.0.2 h1:/3ooFuJwtgpMMe14/7m8a/JIvECMx6SpsPcDRiNyR8o=
github.com/richardlehane/xmldetect v1.0.2/go.mod h1:Zp1lhTLRJa2p2QKA4jOruVQYc0NFQDO0YUz3k/k6JcE=
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
Expand All @@ -1291,6 +1304,10 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/ross-spencer/spargo v0.4.1 h1:+a570tI+az8j/s0+06mntNqwsJ7DXuq7PESUIXlKie8=
github.com/ross-spencer/spargo v0.4.1/go.mod h1:szEHC5cu+q6g0RD7otV7xvYGb+fQVYj1/SkiVTr4IC4=
github.com/ross-spencer/wikiprov v0.2.0 h1:I0RAdlgVW5z2sMk/vAPS5cXTbIsMNAnYEIAS+CZ4urE=
github.com/ross-spencer/wikiprov v0.2.0/go.mod h1:a7GkJgwKK3D2DlrGindbHR2VciEbHHCl6fFAKaiRhVI=
github.com/rukavina/sftpblob v0.0.0-20201030103652-e8e9601e6511 h1:BblWeBQGJbkliNK0SVY5D6huRIiPz5BK+Jwwq875ypw=
github.com/rukavina/sftpblob v0.0.0-20201030103652-e8e9601e6511/go.mod h1:YKl9s0+77hoVBsie7V4ZCW4HFdd6rjMgCRuutI9EObQ=
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
Expand Down Expand Up @@ -1453,6 +1470,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand Down
4 changes: 3 additions & 1 deletion go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,8 @@ github.com/pulumi/pulumi/sdk/v3 v3.81.0 h1:d711GUpjZK1beNpIKFReC1LBmHXYE684sYWnt
github.com/pulumi/pulumi/sdk/v3 v3.81.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/richardlehane/webarchive v1.0.0 h1:RnmjrTFzNoenSypXrIFW0dvw8Isytv5z0Nf44dN1ktQ=
github.com/richardlehane/webarchive v1.0.0/go.mod h1:R+J0ocBfFb0A3vzwXZwrYoPe69PJLEejLzFL5ceDroM=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
Expand Down Expand Up @@ -879,6 +881,7 @@ golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGb
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
Expand Down Expand Up @@ -928,7 +931,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
honnef.co/go/tools v0.1.3 h1:qTakTkI6ni6LFD5sBwwsdSO+AQqbSIxOauHTTQKZ/7o=
lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s=
Expand Down
2 changes: 2 additions & 0 deletions hack/kube/base/minio-setup-buckets-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
"-c",
"mc alias set enduro http://minio.enduro-sdps:9000 ${MINIO_USER} ${MINIO_PASSWORD};
mc mb enduro/sips --ignore-existing;
mc mb enduro/failed-transfers --ignore-existing;
mc mb enduro/failed-sips --ignore-existing;
mc mb enduro/aips --ignore-existing;
mc mb enduro/perma-aips-1 --ignore-existing;
mc mb enduro/perma-aips-2 --ignore-existing;
Expand Down
2 changes: 2 additions & 0 deletions hack/kube/tools/minio-recreate-buckets-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
"mc alias set enduro http://minio.enduro-sdps:9000 ${MINIO_USER} ${MINIO_PASSWORD};
mc rb --force --dangerous enduro;
mc mb enduro/sips --ignore-existing;
mc mb enduro/failed-transfers --ignore-existing;
mc mb enduro/failed-sips --ignore-existing;
mc mb enduro/aips --ignore-existing;
mc mb enduro/perma-aips-1 --ignore-existing;
mc mb enduro/perma-aips-2 --ignore-existing;
Expand Down
Binary file added hack/sampledata/SIP_20111020_BFB_v60.zip
Binary file not shown.
78 changes: 78 additions & 0 deletions hack/sampledata/xsd/ablieferung.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:include schemaLocation="base.xsd"/>

<xs:simpleType name="ablieferungsnummer">
<xs:annotation>
<xs:documentation>Die Ablieferungsnummer dient zur Identifizierung der Ablieferung im Bundesarchiv. Sie besteht aus dem Ablieferungsjahr und einer Laufnummer innerhalb dieses Jahres.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>

<xs:simpleType name="ablieferungstyp">
<xs:annotation>
<xs:documentation>Angabe darüber, aus welcher Umgebung die Ablieferung stammt.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:token">
<xs:enumeration value="GEVER"/>
<xs:enumeration value="FILES"/>
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="angebotsnummer">
<xs:annotation>
<xs:documentation>Die vom BAR vergebene Nummer des Angebots, auf welches sich die Ablieferung stützt.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>

<xs:simpleType name="ablieferndeStelle">
<xs:annotation>
<xs:documentation>Organisationseinheit, welche die abzuliefernden Unterlagen aufbereitet (der Name wird ausgeschrieben, keine Abkürzung), und Name der Person, die für die Ablieferung zuständig ist.</xs:documentation>
</xs:annotation>
<xs:restriction base="text2"/>
</xs:simpleType>

<xs:simpleType name="referenzBewertungsentscheid">
<xs:annotation>
<xs:documentation>Aktenzeichen Bewertungsentscheid(e) BAR, welches die Ablieferung betreffen.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>

<xs:simpleType name="referenzSchutzfristenFormular">
<xs:annotation>
<xs:documentation>Aktenzeichen des Formulars „Meldung von Unterlagen mit besonderer Schutzfrist und öffentlich zugänglichen Unterlagen“, in dem die für die Ablieferung vereinbarten Schutzfristen festgehalten sind.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>

<xs:simpleType name="schutzfristenkategorieAblieferung">
<xs:annotation>
<xs:documentation>Artikel des BGA, der die Schutzfrist festhält, die das Amt im Formular „Meldung von Unterlagen mit besonderer Schutzfrist und öffentlich zugänglichen Unterlagen“ gemeldet hat und vom BAR auf ihre formale Korrektheit und Vollständigkeit kontrolliert worden ist.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>

<xs:simpleType name="schutzfristAblieferung">
<xs:annotation>
<xs:documentation>Dauer der Schutzfrist in Jahren, die das Amt im Formular „Meldung von Unterlagen mit besonderer Schutzfrist und öffentlich zugänglichen Unterlagen“ gemeldet hat und vom BAR auf ihre formale Korrektheit und Vollständigkeit kontrolliert worden ist.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:nonNegativeInteger"/>
</xs:simpleType>

<xs:simpleType name="ablieferungsteile">
<xs:annotation>
<xs:documentation>Angabe über den gesamten Inhalt der Ablieferung (sowohl der digitalen als auch der nicht digitalen Teile).</xs:documentation>
</xs:annotation>
<xs:restriction base="text3"/>
</xs:simpleType>

<xs:simpleType name="bemerkungAblieferung">
<xs:annotation>
<xs:documentation>Zusätzliche Informationen, welche die Ablieferung und ihre Entstehung betreffen. Wenn die Unterlagen in der Ablieferung aus einer periodisierten Registratur stammen, kann hier die Registraturperiode angegeben werden.</xs:documentation>
</xs:annotation>
<xs:restriction base="text4"/>
</xs:simpleType>
</xs:schema>
14 changes: 14 additions & 0 deletions hack/sampledata/xsd/archivischeNotiz.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:include schemaLocation="base.xsd"/>

<xs:simpleType name="idArchivischeNotiz">
<xs:annotation>
<xs:documentation>Paketweit eindeutige ID.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:ID">
<xs:minLength value="1"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
34 changes: 34 additions & 0 deletions hack/sampledata/xsd/archivischerVorgang.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:include schemaLocation="base.xsd"/>

<xs:simpleType name="vorgangstyp">
<xs:annotation>
<xs:documentation>Klassifizierung des Vorgangs.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1">
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="beschreibung">
<xs:annotation>
<xs:documentation>Nachweis und Resultat der durchgeführten Tätigkeit.</xs:documentation>
</xs:annotation>
<xs:restriction base="text4"/>
</xs:simpleType>

<xs:simpleType name="bearbeiter">
<xs:annotation>
<xs:documentation>Name der Person, die den archivischen Vorgang durchgeführt hat.</xs:documentation>
</xs:annotation>
<xs:restriction base="text2"/>
</xs:simpleType>

<xs:simpleType name="referenzUebernahmedossier">
<xs:annotation>
<xs:documentation>Aktenzeichen des Übernahmedossiers in der GEVER Anwendung des Bundesarchiv.</xs:documentation>
</xs:annotation>
<xs:restriction base="text1"/>
</xs:simpleType>
</xs:schema>
Loading
Loading