Skip to content

Add file size validation #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Add file size validation #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e75e8c2
Store document size of the physical file referenced in arkivstruktur
dkumanov Oct 9, 2019
3ed6c97
Add file size validation check to noark55
dkumanov Oct 9, 2019
67e36d9
Add file size validation check for noark53 and noark54
dkumanov Oct 9, 2019
76f1594
Update readme documentation
dkumanov Oct 9, 2019
dba3823
Reorder validation tests so that filesize validation is last
dkumanov Oct 10, 2019
c71ae56
Fix order in the readme as well
dkumanov Oct 10, 2019
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ Below are all validation rules ordered by their execution priority (every test i
|Test|Info,Warning|AST20|Disposal decisions|Provides information about the number of disposal decisions related to series, classes, files, records, and document descriptions, and tests whether the corresponding value in arkivuttrekk.xml (inneholderDokumenterSomSkalKasseres) is correct.|
|Test|Info,Warning|AST21|Disposals|Provides information about the number of disposals of series and document descriptions, and tests whether the corresponding value in arkivuttrekk.xml (omfatterDokumenterSomErKassert) is correct.|
|Test|Info,Warning|AST22|Personal name fields|Checks whether all name fields contain seemingly valid personal names. The regular expressions used for the purpose are "\^[\p{L}\s-'.]*$" and "\^[\p{L}\s-'.]+$" depending on whether the value can be blank or not. The validated fields are: saksansvarlig (M306), kontaktperson (M412), korrespondansepartNavn (M400), sakspartNavn (M302), moeteDeltakerNavn (M372), arkivertAv (M605), avskrevetAv (M618), tilknyttetAv (M621), merknadRegistrertAv (M612), kassertAv (M631), slettetAv (M614), gradertAv (M625), presedensGodkjentAv (M629), verifisertAv (M623), nedgradertAv (M627), opprettetAv (M601), avsluttetAv (M603).|
|Test|Info,Error|AST23|Document object file sizes|Tests whether the recorded file size in arkivstruktur.xml is exactly the same as the one of the referenced physical file on the system.|

**loependejournal:**

Expand Down
1 change: 1 addition & 0 deletions noark-extraction-validator/src/main/java/com/documaster/validator/storage/model/Field.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class Field {

public static final String INTERNAL_ID = "_id";
public static final String DETECTED_CHECKSUM = "_detected_checksum";
public static final String DETECTED_FILE_SIZE = "_detected_file_size";
public static final String DETECTED_FILE_TYPE = "_detected_type";
public static final String IS_VALID_FILE_TYPE = "_is_valid_type";

Expand Down
1 change: 1 addition & 0 deletions ...main/java/com/documaster/validator/validation/noark5/parsers/ArchiveStructureHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc

String contentType = isValidPdfA ? PDFAValidator.VALID_FILE_TYPE : PDFAValidator.getFileType(document);

getItem().add(Field.DETECTED_FILE_SIZE, document.length());
getItem().add(Field.DETECTED_FILE_TYPE, contentType);
getItem().add(Field.DETECTED_CHECKSUM, checksum);
getItem().add(Field.IS_VALID_FILE_TYPE, isValidPdfA);
Expand Down
2 changes: 1 addition & 1 deletion noark-extraction-validator/src/main/resources/noark5/noark5.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ uniqueFields.loependejournal.journalpost = systemid
uniqueFields.offentligjournal.journalpost = systemid

# Additional fields that should be introduced per itemDef
additionalFields.arkivstruktur.dokumentobjekt = _detected_checksum, _detected_type, _is_valid_type
additionalFields.arkivstruktur.dokumentobjekt = _detected_checksum, _detected_file_size, _detected_type, _is_valid_type
25 changes: 25 additions & 0 deletions noark-extraction-validator/src/main/resources/noark5/noark53/noark53-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2868,6 +2868,31 @@
</queries>
</test>

<test id="AST23">
<title>Document object file sizes</title>
<description>
Tests whether the document object file sizes specified in arkivstruktur.xml
match the ones with the physical files on the file system.
</description>
<group>arkivstruktur</group>
<queries>
<info>
<![CDATA[
SELECT COUNT(*) documents_with_mismatched_file_sizes
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</info>
<errors>
<![CDATA[
SELECT referansedokumentfil document, filstoerrelse recorded_document_file_size, _detected_file_size detected_file_size
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</errors>
</queries>
</test>

<!--
============================================================================================================
LOEPENDEJOURNAL
Expand Down
24 changes: 24 additions & 0 deletions noark-extraction-validator/src/main/resources/noark5/noark54/noark54-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2868,6 +2868,30 @@
</queries>
</test>

<test id="AST23">
<title>Document object file sizes</title>
<description>
Tests whether the document object file sizes specified in arkivstruktur.xml
match the ones with the physical files on the file system.
</description>
<group>arkivstruktur</group>
<queries>
<info>
<![CDATA[
SELECT COUNT(*) documents_with_mismatched_file_sizes
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</info>
<errors>
<![CDATA[
SELECT referansedokumentfil document, filstoerrelse recorded_document_file_size, _detected_file_size detected_file_size
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</errors>
</queries>
</test>
<!--
============================================================================================================
LOEPENDEJOURNAL
Expand Down
24 changes: 24 additions & 0 deletions noark-extraction-validator/src/main/resources/noark5/noark55/noark55-validation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2871,6 +2871,30 @@
</queries>
</test>

<test id="AST23">
<title>Document object file sizes</title>
<description>
Tests whether the document object file sizes specified in arkivstruktur.xml
match the ones with the physical files on the file system.
</description>
<group>arkivstruktur</group>
<queries>
<info>
<![CDATA[
SELECT COUNT(*) documents_with_mismatched_file_sizes
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</info>
<errors>
<![CDATA[
SELECT referansedokumentfil document, filstoerrelse recorded_document_file_size, _detected_file_size detected_file_size
FROM arkivstruktur.dokumentobjekt
WHERE filstoerrelse <> _detected_file_size;
]]>
</errors>
</queries>
</test>
<!--
============================================================================================================
LOEPENDEJOURNAL
Expand Down