overSizedFiles =
- contentDirectoryFiles.Where(file => file.Length > singleFileSizeLimit).ToArray();
-
- const string message =
- "Un-packable file found: {0}. The file size {1} B. is more than the current single file size limit of 8 GB.";
-
- foreach (FileInfo file in overSizedFiles)
- Log.Warning(string.Format(message, file.Name, file.Length));
-
- return overSizedFiles.Any();
- }
}
}
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/ExternalModels/xsd/loependeJournal.xsd b/src/Arkivverket.Arkade/ExternalModels/xsd/loependeJournal.xsd
new file mode 100644
index 000000000..9852c4348
--- /dev/null
+++ b/src/Arkivverket.Arkade/ExternalModels/xsd/loependeJournal.xsd
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ Noark 5
+ XML Schema for arkivuttrekk fra Noark 5-løsninger
+ Skjema for løpende journal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Arkivverket.Arkade/ExternalModels/xsd/offentligJournal.xsd b/src/Arkivverket.Arkade/ExternalModels/xsd/offentligJournal.xsd
new file mode 100644
index 000000000..99915b683
--- /dev/null
+++ b/src/Arkivverket.Arkade/ExternalModels/xsd/offentligJournal.xsd
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+ Noark 5
+ XML Schema for arkivuttrekk fra Noark 5-løsninger
+ Skjema for offentlig journal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Arkivverket.Arkade/Identify/TestSessionFactory.cs b/src/Arkivverket.Arkade/Identify/TestSessionFactory.cs
index a2bf83abd..2ea48c809 100644
--- a/src/Arkivverket.Arkade/Identify/TestSessionFactory.cs
+++ b/src/Arkivverket.Arkade/Identify/TestSessionFactory.cs
@@ -71,7 +71,7 @@ private TestSession NewSession(WorkingDirectory workingDirectory, ArchiveType ar
if (archiveType == ArchiveType.Noark5)
return testSession;
- FileInfo addmlFile = archive.GetStructureDescriptionFile();
+ ArkadeFile addmlFile = archive.AddmlFile;
try
{
diff --git a/src/Arkivverket.Arkade/Logging/TestSessionXmlGenerator.cs b/src/Arkivverket.Arkade/Logging/TestSessionXmlGenerator.cs
index 09b0c3a9c..bf579fab1 100644
--- a/src/Arkivverket.Arkade/Logging/TestSessionXmlGenerator.cs
+++ b/src/Arkivverket.Arkade/Logging/TestSessionXmlGenerator.cs
@@ -21,7 +21,6 @@ public void GenerateXmlAndSaveToFile(TestSession testSession)
string pathToLogFile = testSession.Archive.WorkingDirectory.RepositoryOperations()
.WithFile(ArkadeConstants.ArkadeXmlLogFileName)
.FullName;
- _log.Information("Writing xml log file to {LogFile}", pathToLogFile);
testSessionLog log = GetTestSessionLog(testSession);
FileStream fs = new FileStream(pathToLogFile, FileMode.Create);
diff --git a/src/Arkivverket.Arkade/Properties/Settings.Designer.cs b/src/Arkivverket.Arkade/Properties/Settings.Designer.cs
deleted file mode 100644
index ffa974e14..000000000
--- a/src/Arkivverket.Arkade/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace Arkivverket.Arkade.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/src/Arkivverket.Arkade/Properties/Settings.settings b/src/Arkivverket.Arkade/Properties/Settings.settings
deleted file mode 100644
index 8e615f25f..000000000
--- a/src/Arkivverket.Arkade/Properties/Settings.settings
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/Report/HtmlReportGenerator.cs b/src/Arkivverket.Arkade/Report/HtmlReportGenerator.cs
index 93761690b..bdbf13505 100644
--- a/src/Arkivverket.Arkade/Report/HtmlReportGenerator.cs
+++ b/src/Arkivverket.Arkade/Report/HtmlReportGenerator.cs
@@ -189,25 +189,28 @@ private void Summary(TestSession testSession)
_stream.WriteLine(@" ");
- _stream.WriteLine(@" ");
- _stream.WriteLine(@" | ");
- _stream.WriteLine(Resources.Report.LabelNumberOfFilesProcessed);
- _stream.WriteLine(" | ");
- _stream.WriteLine(@" ");
- _stream.WriteLine(testSession.TestSummary.NumberOfProcessedFiles);
- _stream.WriteLine(" | ");
- _stream.WriteLine(@"
");
-
- if (testSession.Archive.ArchiveType != ArchiveType.Noark5)
+ if (testSession.TestSummary != null)
{
_stream.WriteLine(@" ");
_stream.WriteLine(@" | ");
- _stream.WriteLine(Resources.Report.LabelNumberOfRecordsProcessed);
+ _stream.WriteLine(Resources.Report.LabelNumberOfFilesProcessed);
_stream.WriteLine(" | ");
_stream.WriteLine(@" ");
- _stream.WriteLine(testSession.TestSummary.NumberOfProcessedRecords);
+ _stream.WriteLine(testSession.TestSummary.NumberOfProcessedFiles);
_stream.WriteLine(" | ");
_stream.WriteLine(@"
");
+
+ if (testSession.Archive.ArchiveType != ArchiveType.Noark5)
+ {
+ _stream.WriteLine(@" ");
+ _stream.WriteLine(@" | ");
+ _stream.WriteLine(Resources.Report.LabelNumberOfRecordsProcessed);
+ _stream.WriteLine(" | ");
+ _stream.WriteLine(@" ");
+ _stream.WriteLine(testSession.TestSummary.NumberOfProcessedRecords);
+ _stream.WriteLine(" | ");
+ _stream.WriteLine(@"
");
+ }
}
_stream.WriteLine(@" ");
diff --git a/src/Arkivverket.Arkade/Resources/ExceptionMessages.Designer.cs b/src/Arkivverket.Arkade/Resources/ExceptionMessages.Designer.cs
index 520977e36..8f1b1cfd7 100644
--- a/src/Arkivverket.Arkade/Resources/ExceptionMessages.Designer.cs
+++ b/src/Arkivverket.Arkade/Resources/ExceptionMessages.Designer.cs
@@ -69,6 +69,33 @@ internal static string AddTestRunToTestSuite {
}
}
+ ///
+ /// Looks up a localized string similar to Arkade klarte ikke å finne informasjon om {0} i {1}.
+ ///
+ internal static string FileDescriptionParseError {
+ get {
+ return ResourceManager.GetString("FileDescriptionParseError", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Finner ikke filen: {0}.
+ ///
+ internal static string FileNotFound {
+ get {
+ return ResourceManager.GetString("FileNotFound", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Kunne ikke lese inn filen: {0}.
+ ///
+ internal static string FileNotRead {
+ get {
+ return ResourceManager.GetString("FileNotRead", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Kunne ikke kombinere {0} og {1}.
///
@@ -77,5 +104,23 @@ internal static string PathCombine {
return ResourceManager.GetString("PathCombine", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Arkade klarte ikke å tolke informasjon om periodeskille i {0}.
+ ///
+ internal static string PeriodSeparationParseError {
+ get {
+ return ResourceManager.GetString("PeriodSeparationParseError", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Linje {0}: {1}.
+ ///
+ internal static string XmlValidationErrorMessage {
+ get {
+ return ResourceManager.GetString("XmlValidationErrorMessage", resourceCulture);
+ }
+ }
}
}
diff --git a/src/Arkivverket.Arkade/Resources/ExceptionMessages.resx b/src/Arkivverket.Arkade/Resources/ExceptionMessages.resx
index 233645ce8..f58a1a977 100644
--- a/src/Arkivverket.Arkade/Resources/ExceptionMessages.resx
+++ b/src/Arkivverket.Arkade/Resources/ExceptionMessages.resx
@@ -120,7 +120,22 @@
TestRun for the test {0} with ID {1} was not added to test suite. Probable cause: Another test has already been added with the same ID
+
+ Arkade klarte ikke å finne informasjon om {0} i {1}
+
+
+ Finner ikke filen: {0}
+
+
+ Kunne ikke lese inn filen: {0}
+
Kunne ikke kombinere {0} og {1}
+
+ Arkade klarte ikke å tolke informasjon om periodeskille i {0}
+
+
+ Linje {0}: {1}
+
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/Resources/Messages.Designer.cs b/src/Arkivverket.Arkade/Resources/Messages.Designer.cs
index d07b673c9..71278b1d7 100644
--- a/src/Arkivverket.Arkade/Resources/Messages.Designer.cs
+++ b/src/Arkivverket.Arkade/Resources/Messages.Designer.cs
@@ -19,7 +19,7 @@ namespace Arkivverket.Arkade.Resources {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Messages {
@@ -295,7 +295,7 @@ internal static string ControlBooleanValueMessage {
}
///
- /// Looks up a localized string similar to Kontrollerer checksum.
+ /// Looks up a localized string similar to Kontroll av sjekksummer.
///
internal static string ControlChecksumDescription {
get {
@@ -304,29 +304,30 @@ internal static string ControlChecksumDescription {
}
///
- /// Looks up a localized string similar to Ukjent algoritme '{0}'.
+ /// Looks up a localized string similar to Forventet sjekksum: {0}
+ ///Aktuell sjekksum: {1}.
///
- internal static string ControlChecksumMessage1 {
+ internal static string ControlChecksumMessage_ChecksumMismatch {
get {
- return ResourceManager.GetString("ControlChecksumMessage1", resourceCulture);
+ return ResourceManager.GetString("ControlChecksumMessage_ChecksumMismatch", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Forventet checksum '{0}'. Var '{1}'..
+ /// Looks up a localized string similar to Ingen sjekksum funnet i ADDML-filen.
///
- internal static string ControlChecksumMessage2 {
+ internal static string ControlChecksumMessage_ChecksumMissing {
get {
- return ResourceManager.GetString("ControlChecksumMessage2", resourceCulture);
+ return ResourceManager.GetString("ControlChecksumMessage_ChecksumMissing", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Ingen sjekksum i ADDML-filen.
+ /// Looks up a localized string similar to Ukjent sjekksum-algoritme: {0}.
///
- internal static string ControlChecksumMessage3 {
+ internal static string ControlChecksumMessage_UnknownChecksumAlgorithm {
get {
- return ResourceManager.GetString("ControlChecksumMessage3", resourceCulture);
+ return ResourceManager.GetString("ControlChecksumMessage_UnknownChecksumAlgorithm", resourceCulture);
}
}
@@ -664,15 +665,6 @@ internal static string ExceptionReadingAddmlFile {
}
}
- ///
- /// Looks up a localized string similar to Finner ikke filen: {0}.
- ///
- internal static string FileNotFoundMessage {
- get {
- return ResourceManager.GetString("FileNotFoundMessage", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Testing av arkivet er fullført..
///
diff --git a/src/Arkivverket.Arkade/Resources/Messages.resx b/src/Arkivverket.Arkade/Resources/Messages.resx
index 62e8b71e0..735bdf019 100644
--- a/src/Arkivverket.Arkade/Resources/Messages.resx
+++ b/src/Arkivverket.Arkade/Resources/Messages.resx
@@ -196,16 +196,17 @@
Følgende ikke-boolske verdier finnes: {0}
- Kontrollerer checksum
+ Kontroll av sjekksummer
-
- Ukjent algoritme '{0}'
+
+ Forventet sjekksum: {0}
+Aktuell sjekksum: {1}
-
- Forventet checksum '{0}'. Var '{1}'.
+
+ Ingen sjekksum funnet i ADDML-filen
-
- Ingen sjekksum i ADDML-filen
+
+ Ukjent sjekksum-algoritme: {0}
Kontrollerer om definerte koder benyttes og om det benyttes koder som ikke er definert i kodelisten
@@ -319,9 +320,6 @@
Feil ved innlesing av ADDML.
{0}
-
- Finner ikke filen: {0}
-
Testing av arkivet er fullført.
diff --git a/src/Arkivverket.Arkade/Resources/Noark5Messages.Designer.cs b/src/Arkivverket.Arkade/Resources/Noark5Messages.Designer.cs
index 1c0dc6f54..7da0ba2b8 100644
--- a/src/Arkivverket.Arkade/Resources/Noark5Messages.Designer.cs
+++ b/src/Arkivverket.Arkade/Resources/Noark5Messages.Designer.cs
@@ -60,15 +60,6 @@ internal Noark5Messages() {
}
}
- ///
- /// Looks up a localized string similar to Arkivdelreferanser.
- ///
- internal static string ArchivepartReferenceControl {
- get {
- return ResourceManager.GetString("ArchivepartReferenceControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Referanse fra {0} (systemID) {1} til arkivdel (systemID) {2} er ikke gyldig.
///
@@ -87,15 +78,6 @@ internal static string ArchivePartSystemId {
}
}
- ///
- /// Looks up a localized string similar to Start- og sluttdatoer.
- ///
- internal static string ArchiveStartAndEndDateControl {
- get {
- return ResourceManager.GetString("ArchiveStartAndEndDateControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Start- og sluttdato i arkivstrukturen: {0} - {1}.
///
@@ -141,15 +123,6 @@ internal static string ArchiveStartAndEndDateControlMessage_UnEqualJournalDates
}
}
- ///
- /// Looks up a localized string similar to Endringslogg-referanser til arkivstrukturen.
- ///
- internal static string ChangeLogArchiveReferenceControl {
- get {
- return ResourceManager.GetString("ChangeLogArchiveReferenceControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Referanse til arkivenhet er ikke gyldig: (systemID) {0}.
///
@@ -159,33 +132,6 @@ internal static string ChangeLogArchiveReferenceControlMessage {
}
}
- ///
- /// Looks up a localized string similar to Valider xml (ADDML).
- ///
- internal static string CheckWellFormedArchiveStructureXml {
- get {
- return ResourceManager.GetString("CheckWellFormedArchiveStructureXml", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Valider xml (arkivvutrekk.xml).
- ///
- internal static string CheckWellFormedContentDescriptionXml {
- get {
- return ResourceManager.GetString("CheckWellFormedContentDescriptionXml", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Klassereferanser.
- ///
- internal static string ClassReferenceControl {
- get {
- return ResourceManager.GetString("ClassReferenceControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Referanse fra mappe (systemID) {0} til klasse (systemID) {1} er ikke gyldig.
///
@@ -195,15 +141,6 @@ internal static string ClassReferenceControlMessage {
}
}
- ///
- /// Looks up a localized string similar to Kontrollér at refererte dokumenter eksisterer.
- ///
- internal static string ControlDocumentFilesExists {
- get {
- return ResourceManager.GetString("ControlDocumentFilesExists", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Finner ikke filen..
///
@@ -213,15 +150,6 @@ internal static string ControlDocumentsFilesExistsMessage1 {
}
}
- ///
- /// Looks up a localized string similar to Klasser med både underklasse(r) og mappe(r).
- ///
- internal static string ControlNoSuperclassesHasFolders {
- get {
- return ResourceManager.GetString("ControlNoSuperclassesHasFolders", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Klasse med systemID {0}.
///
@@ -231,15 +159,6 @@ internal static string ControlNoSuperclassesHasFoldersMessage {
}
}
- ///
- /// Looks up a localized string similar to Klasser med både underklasse(r) og registrering(er).
- ///
- internal static string ControlNoSuperclassesHasRegistrations {
- get {
- return ResourceManager.GetString("ControlNoSuperclassesHasRegistrations", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Klasse med systemID {0}.
///
@@ -258,15 +177,6 @@ internal static string CouldNotReadFromFiles {
}
}
- ///
- /// Looks up a localized string similar to Opprettelsesdatoer for første og siste registrering.
- ///
- internal static string DatesFirstAndLastRegistration {
- get {
- return ResourceManager.GetString("DatesFirstAndLastRegistration", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Første registrering: Opprettet {0}.
///
@@ -277,7 +187,7 @@ internal static string DatesFirstAndLastRegistrationMessage_CreationDateFirstReg
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Første registrering: Opprettet {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Første registrering: Opprettet {1}.
///
internal static string DatesFirstAndLastRegistrationMessage_CreationDateFirstRegistration_InArchivePart {
get {
@@ -295,7 +205,7 @@ internal static string DatesFirstAndLastRegistrationMessage_CreationDateLastRegi
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Siste registrering: Opprettet {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Siste registrering: Opprettet {1}.
///
internal static string DatesFirstAndLastRegistrationMessage_CreationDateLastRegistration_InArchivePart {
get {
@@ -330,15 +240,6 @@ internal static string DatesFirstAndLastRegistrationMessage_NumberOfRegistration
}
}
- ///
- /// Looks up a localized string similar to Dokumentfilers sjekksummer.
- ///
- internal static string DocumentFilesChecksumControl {
- get {
- return ResourceManager.GetString("DocumentFilesChecksumControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Filen {0} har ikke samme sjekksum som oppgitt i dokumentbeskrivelse (systemID) {1}.
///
@@ -348,15 +249,6 @@ internal static string DocumentFilesChecksumControlMessage {
}
}
- ///
- /// Looks up a localized string similar to Dokumentfiler som mangler referanse.
- ///
- internal static string DocumentfilesReferenceControl {
- get {
- return ResourceManager.GetString("DocumentfilesReferenceControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Ikke-referert fil funnet: {0}.
///
@@ -405,7 +297,7 @@ internal static string InternalSchemaFileIsUsed {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0}: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0}: {1}.
///
internal static string NumberOf_PerArchivePart {
get {
@@ -413,15 +305,6 @@ internal static string NumberOf_PerArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Finn antall arkivdeler.
- ///
- internal static string NumberOfArchiveParts {
- get {
- return ResourceManager.GetString("NumberOfArchiveParts", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall arkivdeler: {0}.
///
@@ -440,15 +323,6 @@ internal static string NumberOfArchivePartsMessage_ArchivepartsInArchive {
}
}
- ///
- /// Looks up a localized string similar to Finn antall arkiv.
- ///
- internal static string NumberOfArchives {
- get {
- return ResourceManager.GetString("NumberOfArchives", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall arkiv: {0}.
///
@@ -467,42 +341,6 @@ internal static string NumberOfArchivesMessage_ArchivesAtLevel {
}
}
- ///
- /// Looks up a localized string similar to Antall saksparter.
- ///
- internal static string NumberOfCaseParts {
- get {
- return ResourceManager.GetString("NumberOfCaseParts", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to I arkivdel (systemID) {0}: {1}.
- ///
- internal static string NumberOfCasePartsMessage {
- get {
- return ResourceManager.GetString("NumberOfCasePartsMessage", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Saksmappenes status i arkivstrukturen.
- ///
- internal static string NumberOfCaseStatusesPerArchivePart {
- get {
- return ResourceManager.GetString("NumberOfCaseStatusesPerArchivePart", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall loggførte endringer.
- ///
- internal static string NumberOfChangesLogged {
- get {
- return ResourceManager.GetString("NumberOfChangesLogged", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall endringer: {0}.
///
@@ -512,24 +350,6 @@ internal static string NumberOfChangesLoggedMessage {
}
}
- ///
- /// Looks up a localized string similar to Finn antall klasser.
- ///
- internal static string NumberOfClasses {
- get {
- return ResourceManager.GetString("NumberOfClasses", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall klasser i det primære klassifikasjonssystemet uten underklasser eller mapper.
- ///
- internal static string NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders {
- get {
- return ResourceManager.GetString("NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall klasser: {0}.
///
@@ -539,15 +359,6 @@ internal static string NumberOfClassesMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall graderinger.
- ///
- internal static string NumberOfClassifications {
- get {
- return ResourceManager.GetString("NumberOfClassifications", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Graderinger i {0} - Antall: {1}.
///
@@ -557,15 +368,6 @@ internal static string NumberOfClassificationsMessage {
}
}
- ///
- /// Looks up a localized string similar to Finn antall klassifikasjonssystem.
- ///
- internal static string NumberOfClassificationSystems {
- get {
- return ResourceManager.GetString("NumberOfClassificationSystems", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall klassifikasjonssystem: {0}.
///
@@ -584,15 +386,6 @@ internal static string NumberOfClassificationSystemsMessage_ClassificationSystem
}
}
- ///
- /// Looks up a localized string similar to Antall merknader.
- ///
- internal static string NumberOfComments {
- get {
- return ResourceManager.GetString("NumberOfComments", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall merknader i basisregistreringer: {0}.
///
@@ -603,7 +396,7 @@ internal static string NumberOfCommentsInBaseRegistrationMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall merknader i basisregistreringer: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall merknader i basisregistreringer: {1}.
///
internal static string NumberOfCommentsInBaseRegistrationMessage_ForArchivePart {
get {
@@ -621,7 +414,7 @@ internal static string NumberOfCommentsInDocumentDescriptionMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall merknader i dokumentbeskrivelser: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall merknader i dokumentbeskrivelser: {1}.
///
internal static string NumberOfCommentsInDocumentDescriptionMessage_ForArchivePart {
get {
@@ -639,7 +432,7 @@ internal static string NumberOfCommentsInFoldersMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall merknader i mapper: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall merknader i mapper: {1}.
///
internal static string NumberOfCommentsInFoldersMessage_ForArchivePart {
get {
@@ -647,15 +440,6 @@ internal static string NumberOfCommentsInFoldersMessage_ForArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Antall konverterte dokumenter.
- ///
- internal static string NumberOfConversions {
- get {
- return ResourceManager.GetString("NumberOfConversions", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall konverteringer: {0}.
///
@@ -665,15 +449,6 @@ internal static string NumberOfConversionsMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall korrespondanseparter.
- ///
- internal static string NumberOfCorrespondenceParts {
- get {
- return ResourceManager.GetString("NumberOfCorrespondenceParts", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall korrespondanseparter: {0}.
///
@@ -683,24 +458,6 @@ internal static string NumberOfCorrespondencePartsMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall kryssreferanser.
- ///
- internal static string NumberOfCrossReferences {
- get {
- return ResourceManager.GetString("NumberOfCrossReferences", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall avskrivninger.
- ///
- internal static string NumberOfDepreciations {
- get {
- return ResourceManager.GetString("NumberOfDepreciations", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall journalposter som avskriver andre journalposter: {0}.
///
@@ -711,7 +468,7 @@ internal static string NumberOfDepreciationsMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall journalposter som avskriver andre journalposter: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall journalposter som avskriver andre journalposter: {1}.
///
internal static string NumberOfDepreciationsMessage_ForArchivePart {
get {
@@ -719,15 +476,6 @@ internal static string NumberOfDepreciationsMessage_ForArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Antall kassasjonsvedtak.
- ///
- internal static string NumberOfDisposalResolutions {
- get {
- return ResourceManager.GetString("NumberOfDisposalResolutions", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Kassasjonsvedtak i {0} - Antall: {1}.
///
@@ -755,15 +503,6 @@ internal static string NumberOfDisposalResolutionsMessage_DocTrueActualFalse {
}
}
- ///
- /// Looks up a localized string similar to Antall utførte kassasjoner.
- ///
- internal static string NumberOfDisposalsExecuted {
- get {
- return ResourceManager.GetString("NumberOfDisposalsExecuted", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall utførte kassasjoner: {0}.
///
@@ -791,69 +530,6 @@ internal static string NumberOfDisposalsExecutedMessage_DocTrueActualFalse {
}
}
- ///
- /// Looks up a localized string similar to Antall dokumentbeskrivelser.
- ///
- internal static string NumberOfDocumentDescriptions {
- get {
- return ResourceManager.GetString("NumberOfDocumentDescriptions", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to I arkivdel (systemID) {0}: {1}.
- ///
- internal static string NumberOfDocumentDescriptionsPerArchivePartMessage {
- get {
- return ResourceManager.GetString("NumberOfDocumentDescriptionsPerArchivePartMessage", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall dokumentbeskrivelser uten dokumentobjekt.
- ///
- internal static string NumberOfDocumentDescriptionsWithoutDocumentObject {
- get {
- return ResourceManager.GetString("NumberOfDocumentDescriptionsWithoutDocumentObject", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall dokumentflyter.
- ///
- internal static string NumberOfDocumentFlows {
- get {
- return ResourceManager.GetString("NumberOfDocumentFlows", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall dokumentobjekter.
- ///
- internal static string NumberOfDocumentObjects {
- get {
- return ResourceManager.GetString("NumberOfDocumentObjects", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to I arkivdel (systemID) {0}: {1}.
- ///
- internal static string NumberOfDocumentObjectsMessage {
- get {
- return ResourceManager.GetString("NumberOfDocumentObjectsMessage", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall av ulike saksmappestatuser.
- ///
- internal static string NumberOfEachCaseFolderStatus {
- get {
- return ResourceManager.GetString("NumberOfEachCaseFolderStatus", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Saksmappestatus: {0} - Antall: {1}.
///
@@ -863,15 +539,6 @@ internal static string NumberOfEachCaseFolderStatusMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall ulike dokumentformater.
- ///
- internal static string NumberOfEachDocumentFormat {
- get {
- return ResourceManager.GetString("NumberOfEachDocumentFormat", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Dokumentformat: {0} - Antall: {1}.
///
@@ -890,15 +557,6 @@ internal static string NumberOfEachDocumentFormatMessage_FormatMismatch {
}
}
- ///
- /// Looks up a localized string similar to Antall ulike dokumentstatuser.
- ///
- internal static string NumberOfEachDocumentStatus {
- get {
- return ResourceManager.GetString("NumberOfEachDocumentStatus", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Dokumentstatus: {0} - Antall: {1}.
///
@@ -908,15 +566,6 @@ internal static string NumberOfEachDocumentStatusMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall av ulike journalposttyper.
- ///
- internal static string NumberOfEachJournalPostType {
- get {
- return ResourceManager.GetString("NumberOfEachJournalPostType", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Journalpost med systemID {0} mangler hoveddokument.
///
@@ -935,15 +584,6 @@ internal static string NumberOfEachJournalPostTypeMessage_TypeAndCount {
}
}
- ///
- /// Looks up a localized string similar to Antall ulike journalstatuser.
- ///
- internal static string NumberOfEachJournalStatus {
- get {
- return ResourceManager.GetString("NumberOfEachJournalStatus", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Journalstatus: {0} - Antall: {1}.
///
@@ -953,24 +593,6 @@ internal static string NumberOfEachJournalStatusMessage {
}
}
- ///
- /// Looks up a localized string similar to Finn antall mapper.
- ///
- internal static string NumberOfFolders {
- get {
- return ResourceManager.GetString("NumberOfFolders", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall mapper som er klassifisert med hver enkelt klasse i arkivstrukturen.
- ///
- internal static string NumberOfFoldersClassified {
- get {
- return ResourceManager.GetString("NumberOfFoldersClassified", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall mapper: {0}.
///
@@ -980,15 +602,6 @@ internal static string NumberOfFoldersMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall mapper for hver klasse.
- ///
- internal static string NumberOfFoldersPerClass {
- get {
- return ResourceManager.GetString("NumberOfFoldersPerClass", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Klasser uten mapper (og uten underklasser) - Antall: {0}.
///
@@ -1008,16 +621,7 @@ internal static string NumberOfFoldersPerClassMessage_NumberOfFolders {
}
///
- /// Looks up a localized string similar to Antall mapper for hvert år.
- ///
- internal static string NumberOfFoldersPerYear {
- get {
- return ResourceManager.GetString("NumberOfFoldersPerYear", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - {1}: {2}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - {1}: {2}.
///
internal static string NumberOfFoldersPerYear_ForArchivePart {
get {
@@ -1025,24 +629,6 @@ internal static string NumberOfFoldersPerYear_ForArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Antall mapper uten registreringer eller undermapper.
- ///
- internal static string NumberOfFoldersWithoutRegistrationsOrSubfolders {
- get {
- return ResourceManager.GetString("NumberOfFoldersWithoutRegistrationsOrSubfolders", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall journalposter.
- ///
- internal static string NumberOfJournalPosts {
- get {
- return ResourceManager.GetString("NumberOfJournalPosts", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Kunne ikke lese fra en eller flere journalfiler.
///
@@ -1097,15 +683,6 @@ internal static string NumberOfJournalPostsMessage_UnEqualJournalNumbers {
}
}
- ///
- /// Looks up a localized string similar to Dokumentfiler med referanse fra mer enn ett dokumentobjekt.
- ///
- internal static string NumberOfMultiReferencedDocumentFiles {
- get {
- return ResourceManager.GetString("NumberOfMultiReferencedDocumentFiles", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Referert dokumentfil: {0} - Antall referanser: {1}.
///
@@ -1115,15 +692,6 @@ internal static string NumberOfMultiReferencedDocumentFilesMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall presedenser.
- ///
- internal static string NumberOfPrecedents {
- get {
- return ResourceManager.GetString("NumberOfPrecedents", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall presedenser i saksmapper: {0}.
///
@@ -1134,7 +702,7 @@ internal static string NumberOfPrecedentsInCaseFolderMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall presedenser i saksmapper: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall presedenser i saksmapper: {1}.
///
internal static string NumberOfPrecedentsInCaseFolderMessage_ForArchivePart {
get {
@@ -1152,7 +720,7 @@ internal static string NumberOfPrecedentsInJournalpostsMessage {
}
///
- /// Looks up a localized string similar to I arkivdel (systemID) {0} - Antall presedenser i journalposter: {1}.
+ /// Looks up a localized string similar to Arkivdel (systemID) {0} - Antall presedenser i journalposter: {1}.
///
internal static string NumberOfPrecedentsInJournalpostsMessage_ForArchivePart {
get {
@@ -1160,15 +728,6 @@ internal static string NumberOfPrecedentsInJournalpostsMessage_ForArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Finn antall registreringer.
- ///
- internal static string NumberOfRegistrations {
- get {
- return ResourceManager.GetString("NumberOfRegistrations", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall registreringer: {0}.
///
@@ -1178,15 +737,6 @@ internal static string NumberOfRegistrationsMessage {
}
}
- ///
- /// Looks up a localized string similar to Antall registreringer for hver klasse (Registreringer under mappe regnes ikke).
- ///
- internal static string NumberOfRegistrationsPerClass {
- get {
- return ResourceManager.GetString("NumberOfRegistrationsPerClass", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Klasser uten registreringer (og uten underklasser) - Antall: {0}.
///
@@ -1205,42 +755,6 @@ internal static string NumberOfRegistrationsPerClassMessage_NumberOfRegistration
}
}
- ///
- /// Looks up a localized string similar to Antall registreringer for hvert år.
- ///
- internal static string NumberOfRegistrationsPerYear {
- get {
- return ResourceManager.GetString("NumberOfRegistrationsPerYear", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall registreringer uten dokumentbeskrivelse.
- ///
- internal static string NumberOfRegistrationsWithoutDocumentDescription {
- get {
- return ResourceManager.GetString("NumberOfRegistrationsWithoutDocumentDescription", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to I arkivdel (systemID) {0}: {1}.
- ///
- internal static string NumberOfRegistrationsWithoutDocumentDescription_ForArchivePart {
- get {
- return ResourceManager.GetString("NumberOfRegistrationsWithoutDocumentDescription_ForArchivePart", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Antall skjerminger.
- ///
- internal static string NumberOfRestrictions {
- get {
- return ResourceManager.GetString("NumberOfRestrictions", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Skjerminger i {0} - Antall: {1}.
///
@@ -1268,15 +782,6 @@ internal static string NumberOfRestrictionsMessage_DocTrueActualFalse {
}
}
- ///
- /// Looks up a localized string similar to Finn status på arkivdeler.
- ///
- internal static string StatusOfArchiveParts {
- get {
- return ResourceManager.GetString("StatusOfArchiveParts", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Arkivdelstatus: {0}.
///
@@ -1295,15 +800,6 @@ internal static string StatusOfArchivePartsMessage_ForArchivePart {
}
}
- ///
- /// Looks up a localized string similar to Systemidentifikasjoner.
- ///
- internal static string SystemIdUniqueControl {
- get {
- return ResourceManager.GetString("SystemIdUniqueControl", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Ikke-unik ID: Systemidentifikasjonen (systemID) {0} forekommer {1} ganger.
///
@@ -1313,24 +809,6 @@ internal static string SystemIdUniqueControlMessage {
}
}
- ///
- /// Looks up a localized string similar to Valider sjekksummer.
- ///
- internal static string ValidateAddmlDataobjectsChecksums {
- get {
- return ResourceManager.GetString("ValidateAddmlDataobjectsChecksums", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Valider antallet dokumentfiler.
- ///
- internal static string ValidateNumberOfDocumentfiles {
- get {
- return ResourceManager.GetString("ValidateNumberOfDocumentfiles", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Antall dokumentfiler ble ikke funnet oppgitt.
///
@@ -1384,32 +862,5 @@ internal static string ValidateNumberOfDocumentfilesMessage_NumberOfFilesFound {
return ResourceManager.GetString("ValidateNumberOfDocumentfilesMessage_NumberOfFilesFound", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Valider xml i henhold til skjema (ADDML).
- ///
- internal static string ValidateXmlWithSchema {
- get {
- return ResourceManager.GetString("ValidateXmlWithSchema", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Validert i henhold til XML-skjema..
- ///
- internal static string ValidateXmlWithSchemaMessageValid {
- get {
- return ResourceManager.GetString("ValidateXmlWithSchemaMessageValid", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to {0} er ikke gyldig i henhold til XML-skjema: {1}.
- ///
- internal static string XmlDoesNotValidateWithSchema {
- get {
- return ResourceManager.GetString("XmlDoesNotValidateWithSchema", resourceCulture);
- }
- }
}
}
diff --git a/src/Arkivverket.Arkade/Resources/Noark5Messages.resx b/src/Arkivverket.Arkade/Resources/Noark5Messages.resx
index 4bda009bb..1488bc507 100644
--- a/src/Arkivverket.Arkade/Resources/Noark5Messages.resx
+++ b/src/Arkivverket.Arkade/Resources/Noark5Messages.resx
@@ -117,21 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Valider xml (ADDML)
-
-
- Valider xml (arkivvutrekk.xml)
-
-
- Kontrollér at refererte dokumenter eksisterer
-
Finner ikke filen.
-
- Opprettelsesdatoer for første og siste registrering
-
Første registrering: Opprettet {0}
@@ -147,9 +135,6 @@
Antall registreringer funnet: {0}
-
- Dokumentfiler som mangler referanse
-
Ikke-referert fil funnet: {0}
@@ -158,102 +143,30 @@
Forventet: {1}
Generert: {2}
-
- {0} er ikke gyldig i henhold til XML-skjema: {1}
-
-
- Finn antall arkivdeler
-
Antall arkivdeler: {0}
-
- Finn antall arkiv
-
Antall arkiv: {0}
-
- Antall saksparter
-
-
- I arkivdel (systemID) {0}: {1}
-
-
- Saksmappenes status i arkivstrukturen
-
-
- Finn antall klasser
-
-
- Antall klasser i det primære klassifikasjonssystemet uten underklasser eller mapper
-
Antall klasser: {0}
-
- Finn antall klassifikasjonssystem
-
Antall klassifikasjonssystem: {0}
-
- Antall merknader
-
Antall merknader i mapper: {0}
-
- Antall korrespondanseparter
-
Antall korrespondanseparter: {0}
-
- Antall kryssreferanser
-
-
- Antall avskrivninger
-
Antall journalposter som avskriver andre journalposter: {0}
-
- Antall dokumentbeskrivelser
-
-
- I arkivdel (systemID) {0}: {1}
-
-
- Antall dokumentbeskrivelser uten dokumentobjekt
-
-
- Antall dokumentflyter
-
-
- Antall dokumentobjekter
-
-
- I arkivdel (systemID) {0}: {1}
-
-
- Finn antall mapper
-
-
- Antall mapper som er klassifisert med hver enkelt klasse i arkivstrukturen
-
Antall mapper: {0}
-
- Antall mapper for hvert år
-
-
- Antall mapper uten registreringer eller undermapper
-
-
- Antall journalposter
-
Antallet journalposter i offentlig og løpende journal er ulikt
@@ -269,36 +182,12 @@ Generert: {2}
Antall journalposter dokumentert i løpende journal: {0}
-
- Antall av ulike journalposttyper
-
-
- Antall presedenser
-
Antall presedenser i saksmapper: {0}
-
- Finn antall registreringer
-
Antall registreringer: {0}
-
- Antall registreringer for hvert år
-
-
- Antall registreringer uten dokumentbeskrivelse
-
-
- Finn status på arkivdeler
-
-
- Valider sjekksummer
-
-
- Valider antallet dokumentfiler
-
Antall dokumentfiler ble ikke funnet oppgitt
@@ -317,78 +206,45 @@ Generert: {2}
Antall dokumentfiler funnet: {0}
-
- Valider xml i henhold til skjema (ADDML)
-
-
- Validert i henhold til XML-skjema.
-
Journalpost med systemID {0} mangler hoveddokument
Journalposttype: {0} - Antall: {1}
-
- Antall registreringer for hver klasse (Registreringer under mappe regnes ikke)
-
Klasse (systemID): {0} - Antall: {1}
Klasser uten registreringer (og uten underklasser) - Antall: {0}
-
- Antall ulike journalstatuser
-
Journalstatus: {0} - Antall: {1}
-
- Antall ulike dokumentstatuser
-
Dokumentstatus: {0} - Antall: {1}
-
- Antall ulike dokumentformater
-
Dokumentformat: {0} - Antall: {1}
Format-misforhold: Dokumentformat: {0} - Dokumentfilreferanse: {1}
-
- Dokumentfiler med referanse fra mer enn ett dokumentobjekt
-
Referert dokumentfil: {0} - Antall referanser: {1}
Arkivdel (systemID): {0}
-
- Klasser med både underklasse(r) og mappe(r)
-
Klasse med systemID {0}
-
- Antall graderinger
-
Graderinger i {0} - Antall: {1}
-
- Antall kassasjonsvedtak
-
Kassasjonsvedtak i {0} - Antall: {1}
-
- Antall utførte kassasjoner
-
Antall utførte kassasjoner: {0}
@@ -404,9 +260,6 @@ Generert: {2}
Det er angitt at uttrekket skal inneholde kassasjonsvedtak, men ingen kassasjonsvedtak ble funnet
-
- Antall skjerminger
-
Skjerminger i {0} - Antall: {1}
@@ -416,15 +269,9 @@ Generert: {2}
Det er angitt at uttrekket skal inneholde skjerminger, men ingen skjerminger ble funnet
-
- Antall konverterte dokumenter
-
Antall konverteringer: {0}
-
- Start- og sluttdatoer
-
Start- og sluttdato i arkivstrukturen: {0} - {1}
@@ -440,48 +287,27 @@ Generert: {2}
Datoer i offentlig og løpende journal er ikke like
-
- Antall loggførte endringer
-
Antall endringer: {0}
-
- Endringslogg-referanser til arkivstrukturen
-
Referanse til arkivenhet er ikke gyldig: (systemID) {0}
Filen {0} ble ikke funnet
-
- Arkivdelreferanser
-
Referanse fra {0} (systemID) {1} til arkivdel (systemID) {2} er ikke gyldig
-
- Systemidentifikasjoner
-
Ikke-unik ID: Systemidentifikasjonen (systemID) {0} forekommer {1} ganger
-
- Klasser med både underklasse(r) og registrering(er)
-
Klasse med systemID {0}
-
- Klassereferanser
-
Referanse fra mappe (systemID) {0} til klasse (systemID) {1} er ikke gyldig
-
- Dokumentfilers sjekksummer
-
Filen {0} har ikke samme sjekksum som oppgitt i dokumentbeskrivelse (systemID) {1}
@@ -491,18 +317,12 @@ Generert: {2}
Skjemafil {0} ble ikke funnet i uttrekket. Validering gjøres ihht. en versjon av {0} som er innebygget i Arkade
-
- Antall mapper for hver klasse
-
Klasser uten mapper (og uten underklasser) - Antall: {0}
Klasse (systemID): {0} - Antall: {1}
-
- Antall av ulike saksmappestatuser
-
Saksmappestatus: {0} - Antall: {1}
@@ -521,20 +341,17 @@ Generert: {2}
Antall klassifikasjonssystemer i arkivdel (systemID) {0}: {1}
-
- I arkivdel (systemID) {0}: {1}
-
- I arkivdel (systemID) {0}: {1}
+ Arkivdel (systemID) {0}: {1}
- I arkivdel (systemID) {0} - {1}: {2}
+ Arkivdel (systemID) {0} - {1}: {2}
- I arkivdel (systemID) {0} - Første registrering: Opprettet {1}
+ Arkivdel (systemID) {0} - Første registrering: Opprettet {1}
- I arkivdel (systemID) {0} - Siste registrering: Opprettet {1}
+ Arkivdel (systemID) {0} - Siste registrering: Opprettet {1}
Kunne ikke lese fra en eller flere filer
@@ -543,10 +360,10 @@ Generert: {2}
Periodeskille er skarpt og antallet journalposter i arkivstrukturen er ikke likt det i offentlig og løpende journal
- I arkivdel (systemID) {0} - Antall presedenser i journalposter: {1}
+ Arkivdel (systemID) {0} - Antall presedenser i journalposter: {1}
- I arkivdel (systemID) {0} - Antall presedenser i saksmapper: {1}
+ Arkivdel (systemID) {0} - Antall presedenser i saksmapper: {1}
Antall presedenser i journalposter: {0}
@@ -558,15 +375,15 @@ Generert: {2}
Antall merknader i dokumentbeskrivelser: {0}
- I arkivdel (systemID) {0} - Antall merknader i basisregistreringer: {1}
+ Arkivdel (systemID) {0} - Antall merknader i basisregistreringer: {1}
- I arkivdel (systemID) {0} - Antall merknader i dokumentbeskrivelser: {1}
+ Arkivdel (systemID) {0} - Antall merknader i dokumentbeskrivelser: {1}
- I arkivdel (systemID) {0} - Antall merknader i mapper: {1}
+ Arkivdel (systemID) {0} - Antall merknader i mapper: {1}
- I arkivdel (systemID) {0} - Antall journalposter som avskriver andre journalposter: {1}
+ Arkivdel (systemID) {0} - Antall journalposter som avskriver andre journalposter: {1}
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/Resources/Noark5TestDescriptions.Designer.cs b/src/Arkivverket.Arkade/Resources/Noark5TestDescriptions.Designer.cs
index 4c9006142..b3c7ff45c 100644
--- a/src/Arkivverket.Arkade/Resources/Noark5TestDescriptions.Designer.cs
+++ b/src/Arkivverket.Arkade/Resources/Noark5TestDescriptions.Designer.cs
@@ -19,7 +19,7 @@ namespace Arkivverket.Arkade.Resources {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Noark5TestDescriptions {
diff --git a/src/Arkivverket.Arkade/Resources/Noark5TestNames.Designer.cs b/src/Arkivverket.Arkade/Resources/Noark5TestNames.Designer.cs
new file mode 100644
index 000000000..f8942440e
--- /dev/null
+++ b/src/Arkivverket.Arkade/Resources/Noark5TestNames.Designer.cs
@@ -0,0 +1,522 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Arkivverket.Arkade.Resources {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Noark5TestNames {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Noark5TestNames() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Arkivverket.Arkade.Resources.Noark5TestNames", typeof(Noark5TestNames).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Arkivdelreferanser.
+ ///
+ internal static string ArchivepartReferenceControl {
+ get {
+ return ResourceManager.GetString("ArchivepartReferenceControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Start- og sluttdatoer.
+ ///
+ internal static string ArchiveStartAndEndDateControl {
+ get {
+ return ResourceManager.GetString("ArchiveStartAndEndDateControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Endringslogg-referanser til arkivstrukturen.
+ ///
+ internal static string ChangeLogArchiveReferenceControl {
+ get {
+ return ResourceManager.GetString("ChangeLogArchiveReferenceControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klassereferanser.
+ ///
+ internal static string ClassReferenceControl {
+ get {
+ return ResourceManager.GetString("ClassReferenceControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Refererte dokumenters eksistens.
+ ///
+ internal static string ControlDocumentFilesExists {
+ get {
+ return ResourceManager.GetString("ControlDocumentFilesExists", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klasser med både underklasse(r) og mappe(r).
+ ///
+ internal static string ControlNoSuperclassesHasFolders {
+ get {
+ return ResourceManager.GetString("ControlNoSuperclassesHasFolders", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klasser med både underklasse(r) og registrering(er).
+ ///
+ internal static string ControlNoSuperclassesHasRegistrations {
+ get {
+ return ResourceManager.GetString("ControlNoSuperclassesHasRegistrations", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Dokumentfilers sjekksummer.
+ ///
+ internal static string DocumentFilesChecksumControl {
+ get {
+ return ResourceManager.GetString("DocumentFilesChecksumControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Dokumentfiler som mangler referanse.
+ ///
+ internal static string DocumentfilesReferenceControl {
+ get {
+ return ResourceManager.GetString("DocumentfilesReferenceControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Opprettelsesdatoer for første og siste registrering.
+ ///
+ internal static string FirstAndLastRegistrationCreationDates {
+ get {
+ return ResourceManager.GetString("FirstAndLastRegistrationCreationDates", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall arkivdeler.
+ ///
+ internal static string NumberOfArchiveParts {
+ get {
+ return ResourceManager.GetString("NumberOfArchiveParts", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall arkiv.
+ ///
+ internal static string NumberOfArchives {
+ get {
+ return ResourceManager.GetString("NumberOfArchives", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall saksparter.
+ ///
+ internal static string NumberOfCaseParts {
+ get {
+ return ResourceManager.GetString("NumberOfCaseParts", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall loggførte endringer.
+ ///
+ internal static string NumberOfChangesLogged {
+ get {
+ return ResourceManager.GetString("NumberOfChangesLogged", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall klasser.
+ ///
+ internal static string NumberOfClasses {
+ get {
+ return ResourceManager.GetString("NumberOfClasses", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall klasser i det primære klassifikasjonssystemet uten underklasser, mapper eller registreringer.
+ ///
+ internal static string NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders {
+ get {
+ return ResourceManager.GetString("NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall graderinger.
+ ///
+ internal static string NumberOfClassifications {
+ get {
+ return ResourceManager.GetString("NumberOfClassifications", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall klassifikasjonssystem.
+ ///
+ internal static string NumberOfClassificationSystems {
+ get {
+ return ResourceManager.GetString("NumberOfClassificationSystems", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall merknader.
+ ///
+ internal static string NumberOfComments {
+ get {
+ return ResourceManager.GetString("NumberOfComments", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall konverterte dokumenter.
+ ///
+ internal static string NumberOfConversions {
+ get {
+ return ResourceManager.GetString("NumberOfConversions", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall korrespondanseparter.
+ ///
+ internal static string NumberOfCorrespondenceParts {
+ get {
+ return ResourceManager.GetString("NumberOfCorrespondenceParts", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall kryssreferanser.
+ ///
+ internal static string NumberOfCrossReferences {
+ get {
+ return ResourceManager.GetString("NumberOfCrossReferences", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall avskrivninger.
+ ///
+ internal static string NumberOfDepreciations {
+ get {
+ return ResourceManager.GetString("NumberOfDepreciations", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall kassasjonsvedtak.
+ ///
+ internal static string NumberOfDisposalResolutions {
+ get {
+ return ResourceManager.GetString("NumberOfDisposalResolutions", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall utførte kassasjoner.
+ ///
+ internal static string NumberOfDisposalsExecuted {
+ get {
+ return ResourceManager.GetString("NumberOfDisposalsExecuted", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall dokumentbeskrivelser.
+ ///
+ internal static string NumberOfDocumentDescriptions {
+ get {
+ return ResourceManager.GetString("NumberOfDocumentDescriptions", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall dokumentbeskrivelser uten dokumentobjekt.
+ ///
+ internal static string NumberOfDocumentDescriptionsWithoutDocumentObject {
+ get {
+ return ResourceManager.GetString("NumberOfDocumentDescriptionsWithoutDocumentObject", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall dokumentflyter.
+ ///
+ internal static string NumberOfDocumentFlows {
+ get {
+ return ResourceManager.GetString("NumberOfDocumentFlows", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall dokumentobjekter.
+ ///
+ internal static string NumberOfDocumentObjects {
+ get {
+ return ResourceManager.GetString("NumberOfDocumentObjects", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall av ulike saksmappestatuser.
+ ///
+ internal static string NumberOfEachCaseFolderStatus {
+ get {
+ return ResourceManager.GetString("NumberOfEachCaseFolderStatus", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall av ulike dokumentformater.
+ ///
+ internal static string NumberOfEachDocumentFormat {
+ get {
+ return ResourceManager.GetString("NumberOfEachDocumentFormat", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall av ulike dokumentstatuser.
+ ///
+ internal static string NumberOfEachDocumentStatus {
+ get {
+ return ResourceManager.GetString("NumberOfEachDocumentStatus", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall av ulike journalposttyper.
+ ///
+ internal static string NumberOfEachJournalPostType {
+ get {
+ return ResourceManager.GetString("NumberOfEachJournalPostType", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall av ulike journalstatuser.
+ ///
+ internal static string NumberOfEachJournalStatus {
+ get {
+ return ResourceManager.GetString("NumberOfEachJournalStatus", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall mapper.
+ ///
+ internal static string NumberOfFolders {
+ get {
+ return ResourceManager.GetString("NumberOfFolders", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall mapper for hver klasse.
+ ///
+ internal static string NumberOfFoldersPerClass {
+ get {
+ return ResourceManager.GetString("NumberOfFoldersPerClass", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall mapper for hvert år.
+ ///
+ internal static string NumberOfFoldersPerYear {
+ get {
+ return ResourceManager.GetString("NumberOfFoldersPerYear", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall mapper uten registreringer eller undermapper.
+ ///
+ internal static string NumberOfFoldersWithoutRegistrationsOrSubfolders {
+ get {
+ return ResourceManager.GetString("NumberOfFoldersWithoutRegistrationsOrSubfolders", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall journalposter.
+ ///
+ internal static string NumberOfJournalPosts {
+ get {
+ return ResourceManager.GetString("NumberOfJournalPosts", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Dokumentfiler med referanse fra mer enn ett dokumentobjekt.
+ ///
+ internal static string NumberOfMultiReferencedDocumentFiles {
+ get {
+ return ResourceManager.GetString("NumberOfMultiReferencedDocumentFiles", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall presedenser.
+ ///
+ internal static string NumberOfPrecedents {
+ get {
+ return ResourceManager.GetString("NumberOfPrecedents", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall registreringer.
+ ///
+ internal static string NumberOfRegistrations {
+ get {
+ return ResourceManager.GetString("NumberOfRegistrations", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall registreringer for hver klasse (ikke medregnet registreringer under mappe).
+ ///
+ internal static string NumberOfRegistrationsPerClass {
+ get {
+ return ResourceManager.GetString("NumberOfRegistrationsPerClass", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall registreringer for hvert år.
+ ///
+ internal static string NumberOfRegistrationsPerYear {
+ get {
+ return ResourceManager.GetString("NumberOfRegistrationsPerYear", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall registreringer uten dokumentbeskrivelse.
+ ///
+ internal static string NumberOfRegistrationsWithoutDocumentDescription {
+ get {
+ return ResourceManager.GetString("NumberOfRegistrationsWithoutDocumentDescription", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Antall skjerminger.
+ ///
+ internal static string NumberOfRestrictions {
+ get {
+ return ResourceManager.GetString("NumberOfRestrictions", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Status på arkivdeler.
+ ///
+ internal static string StatusOfArchiveParts {
+ get {
+ return ResourceManager.GetString("StatusOfArchiveParts", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Systemidentifikasjoner.
+ ///
+ internal static string SystemIdUniqueControl {
+ get {
+ return ResourceManager.GetString("SystemIdUniqueControl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Validering av sjekksummer.
+ ///
+ internal static string ValidateAddmlDataobjectsChecksums {
+ get {
+ return ResourceManager.GetString("ValidateAddmlDataobjectsChecksums", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Validering av antall dokumentfiler.
+ ///
+ internal static string ValidateNumberOfDocumentfiles {
+ get {
+ return ResourceManager.GetString("ValidateNumberOfDocumentfiles", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Validering av XML i henhold til skjema.
+ ///
+ internal static string ValidateXmlWithSchema {
+ get {
+ return ResourceManager.GetString("ValidateXmlWithSchema", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/src/Arkivverket.Arkade/Resources/Noark5TestNames.resx b/src/Arkivverket.Arkade/Resources/Noark5TestNames.resx
new file mode 100644
index 000000000..a31cb4f48
--- /dev/null
+++ b/src/Arkivverket.Arkade/Resources/Noark5TestNames.resx
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Refererte dokumenters eksistens
+
+
+ Opprettelsesdatoer for første og siste registrering
+
+
+ Dokumentfiler som mangler referanse
+
+
+ Antall arkivdeler
+
+
+ Antall arkiv
+
+
+ Antall saksparter
+
+
+ Antall klasser
+
+
+ Antall klasser i det primære klassifikasjonssystemet uten underklasser, mapper eller registreringer
+
+
+ Antall klassifikasjonssystem
+
+
+ Antall merknader
+
+
+ Antall korrespondanseparter
+
+
+ Antall kryssreferanser
+
+
+ Antall avskrivninger
+
+
+ Antall dokumentbeskrivelser
+
+
+ Antall dokumentbeskrivelser uten dokumentobjekt
+
+
+ Antall dokumentflyter
+
+
+ Antall dokumentobjekter
+
+
+ Antall mapper
+
+
+ Antall mapper for hvert år
+
+
+ Antall mapper uten registreringer eller undermapper
+
+
+ Antall journalposter
+
+
+ Antall av ulike journalposttyper
+
+
+ Antall presedenser
+
+
+ Antall registreringer
+
+
+ Antall registreringer for hvert år
+
+
+ Antall registreringer uten dokumentbeskrivelse
+
+
+ Status på arkivdeler
+
+
+ Validering av sjekksummer
+
+
+ Validering av antall dokumentfiler
+
+
+ Validering av XML i henhold til skjema
+
+
+ Antall registreringer for hver klasse (ikke medregnet registreringer under mappe)
+
+
+ Antall av ulike journalstatuser
+
+
+ Antall av ulike dokumentstatuser
+
+
+ Antall av ulike dokumentformater
+
+
+ Dokumentfiler med referanse fra mer enn ett dokumentobjekt
+
+
+ Klasser med både underklasse(r) og mappe(r)
+
+
+ Antall graderinger
+
+
+ Antall kassasjonsvedtak
+
+
+ Antall utførte kassasjoner
+
+
+ Antall skjerminger
+
+
+ Antall konverterte dokumenter
+
+
+ Start- og sluttdatoer
+
+
+ Antall loggførte endringer
+
+
+ Endringslogg-referanser til arkivstrukturen
+
+
+ Systemidentifikasjoner
+
+
+ Klasser med både underklasse(r) og registrering(er)
+
+
+ Klassereferanser
+
+
+ Dokumentfilers sjekksummer
+
+
+ Antall mapper for hver klasse
+
+
+ Antall av ulike saksmappestatuser
+
+
+ Arkivdelreferanser
+
+
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ArchiveStartAndEndDateControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/ArchiveStartAndEndDateControl.cs
index 538680818..b35f83f3d 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ArchiveStartAndEndDateControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ArchiveStartAndEndDateControl.cs
@@ -35,7 +35,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ArchiveStartAndEndDateControl;
+ return Noark5TestNames.ArchiveStartAndEndDateControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ArchivepartReferenceControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/ArchivepartReferenceControl.cs
index d6ea2c2bf..ce5c0ad04 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ArchivepartReferenceControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ArchivepartReferenceControl.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ArchivepartReferenceControl;
+ return Noark5TestNames.ArchivepartReferenceControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ChangeLogArchiveReferenceControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/ChangeLogArchiveReferenceControl.cs
index 6065d7344..6948099d9 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ChangeLogArchiveReferenceControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ChangeLogArchiveReferenceControl.cs
@@ -27,7 +27,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ChangeLogArchiveReferenceControl;
+ return Noark5TestNames.ChangeLogArchiveReferenceControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ClassReferenceControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/ClassReferenceControl.cs
index 250925b20..7ba1894d3 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ClassReferenceControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ClassReferenceControl.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ClassReferenceControl;
+ return Noark5TestNames.ClassReferenceControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ControlDocumentFilesExists.cs b/src/Arkivverket.Arkade/Tests/Noark5/ControlDocumentFilesExists.cs
index 98456b419..109c3bba5 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ControlDocumentFilesExists.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ControlDocumentFilesExists.cs
@@ -27,7 +27,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ControlDocumentFilesExists;
+ return Noark5TestNames.ControlDocumentFilesExists;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasFolders.cs b/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasFolders.cs
index da0389f2b..d698f11b3 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasFolders.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasFolders.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ControlNoSuperclassesHasFolders;
+ return Noark5TestNames.ControlNoSuperclassesHasFolders;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasRegistrations.cs b/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasRegistrations.cs
index 6456f3d52..41c730cdb 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasRegistrations.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/ControlNoSuperclassesHasRegistrations.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ControlNoSuperclassesHasRegistrations;
+ return Noark5TestNames.ControlNoSuperclassesHasRegistrations;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/DocumentFilesChecksumControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/DocumentFilesChecksumControl.cs
index 302699e9c..7c39b0712 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/DocumentFilesChecksumControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/DocumentFilesChecksumControl.cs
@@ -33,7 +33,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.DocumentFilesChecksumControl;
+ return Noark5TestNames.DocumentFilesChecksumControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/DocumentfilesReferenceControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/DocumentfilesReferenceControl.cs
index 639aa14e4..0174c9ad1 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/DocumentfilesReferenceControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/DocumentfilesReferenceControl.cs
@@ -28,7 +28,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.DocumentfilesReferenceControl;
+ return Noark5TestNames.DocumentfilesReferenceControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/FirstAndLastRegistrationCreationDates.cs b/src/Arkivverket.Arkade/Tests/Noark5/FirstAndLastRegistrationCreationDates.cs
index 221ab1e37..415a07198 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/FirstAndLastRegistrationCreationDates.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/FirstAndLastRegistrationCreationDates.cs
@@ -24,7 +24,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.DatesFirstAndLastRegistration;
+ return Noark5TestNames.FirstAndLastRegistrationCreationDates;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestHelper.cs b/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestHelper.cs
index b345dc4f5..206053768 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestHelper.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestHelper.cs
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
+using System.IO;
using System.Linq;
using Arkivverket.Arkade.Core;
using Arkivverket.Arkade.Core.Noark5;
@@ -32,18 +33,58 @@ public static bool IdentifiesBaseRegistrationInRegistration(ReadElementEventArgs
public static bool PeriodSeparationIsSharp(Archive archive)
{
- var archiveExtraction = GetAddmlObject(ArkadeConstants.ArkivuttrekkXmlFileName, archive);
+ bool inboundSeparationIsSharp;
+ bool outboundSeparationIsSharp;
- dataObject archiveExtractionElement = archiveExtraction.dataset[0].dataObjects.dataObject[0];
- property infoElement = archiveExtractionElement.properties[0];
- property additionalInfoElement = infoElement.properties[1];
- property periodProperty =
- additionalInfoElement.properties.FirstOrDefault(p => p.name == "periode");
+ addml archiveExtraction = GetAddmlObject(ArkadeConstants.ArkivuttrekkXmlFileName, archive);
- property inboundSeparation = periodProperty.properties[0];
- property outboundSeparation = periodProperty.properties[1];
+ try
+ {
+ dataObject archiveExtractionElement = archiveExtraction.dataset[0].dataObjects.dataObject[0];
+ property infoElement = archiveExtractionElement.properties[0];
+ property additionalInfoElement = infoElement.properties[1];
+ property periodProperty =
+ additionalInfoElement.properties.FirstOrDefault(p => p.name == "periode");
+
+ property inboundSeparationProperty = periodProperty.properties[0];
+ property outboundSeparationProperty = periodProperty.properties[1];
+
+ inboundSeparationIsSharp = inboundSeparationProperty.value.Equals("skarp");
+ outboundSeparationIsSharp = outboundSeparationProperty.value.Equals("skarp");
+ }
+ catch
+ {
+ string exceptionMessage = string.Format(Resources.ExceptionMessages.PeriodSeparationParseError, ArkadeConstants.ArkivuttrekkXmlFileName);
+
+ throw new ArkadeException(exceptionMessage);
+ }
+
+ return inboundSeparationIsSharp && outboundSeparationIsSharp;
+ }
+ public static bool FileIsDescribed(string fileName, Archive archive)
+ {
+ addml archiveExtraction = GetAddmlObject(ArkadeConstants.ArkivuttrekkXmlFileName, archive);
+
+ try
+ {
+ dataObject archiveExtractionElement = archiveExtraction.dataset[0].dataObjects.dataObject[0];
+
+ dataObject fileElement = archiveExtractionElement.dataObjects.dataObject.FirstOrDefault(
+ d => d.name == Path.GetFileNameWithoutExtension(fileName)
+ );
- return inboundSeparation.value.Equals("skarp") && outboundSeparation.value.Equals("skarp");
+ return fileElement != null;
+ }
+ catch
+ {
+ string exceptionMessage = string.Format(
+ Resources.ExceptionMessages.FileDescriptionParseError,
+ fileName,
+ ArkadeConstants.ArkivuttrekkXmlFileName
+ );
+
+ throw new ArkadeException(exceptionMessage);
+ }
}
public static addml GetAddmlObject(string addmlXmlFileName, Archive archive)
@@ -76,7 +117,11 @@ public static JournalHead GetJournalHead(string journalXmlFileName, Archive arch
public static bool TryParseArchiveDate(string dateStringFromArchive, out DateTime dateTime)
{
- var acceptedFormats = new[] { "yyyy-MM-dd", "yyyy-MM-ddTHH:mm:ss", "yyyy-MM-ddTHH:mm:ssZ" };
+ var acceptedFormats = new[]
+ {
+ "yyyy-MM-dd", // date only
+ "yyyy-MM-ddTHH:mm:ss.FFFFFFFK", // date + time [+ milliseconds] [+ timezone]
+ };
return DateTime.TryParseExact(dateStringFromArchive, acceptedFormats,
CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTime);
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestProvider.cs b/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestProvider.cs
index 601433ab0..fa176058a 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestProvider.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/Noark5TestProvider.cs
@@ -6,19 +6,12 @@ namespace Arkivverket.Arkade.Tests.Noark5
{
public class Noark5TestProvider: ITestProvider
{
- private readonly IArchiveContentReader _archiveReader;
-
- public Noark5TestProvider(IArchiveContentReader archiveReader)
- {
- _archiveReader = archiveReader;
- }
-
public List GetStructureTests()
{
return new List
{
new ValidateAddmlDataobjectsChecksums(),
- new ValidateXmlWithSchema(_archiveReader),
+ new ValidateXmlWithSchema(),
new ValidateNumberOfDocumentfiles(),
};
}
@@ -39,7 +32,7 @@ public List GetContentTests(Archive archive)
new NumberOfDocumentDescriptions(),
new NumberOfDocumentDescriptionsWithoutDocumentObject(),
new NumberOfDocumentObjects(),
- new NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders(),
+ new NumberOfClassesInMainClassificationSystemWithoutSubClassesFoldersOrRegistrations(),
new NumberOfCaseParts(),
new ControlDocumentFilesExists(archive),
new NumberOfComments(),
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchiveParts.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchiveParts.cs
index f3e60b319..d326fc6d2 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchiveParts.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchiveParts.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfArchiveParts;
+ return Noark5TestNames.NumberOfArchiveParts;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchives.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchives.cs
index 28001bd44..aad389215 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchives.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfArchives.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfArchives;
+ return Noark5TestNames.NumberOfArchives;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCaseParts.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCaseParts.cs
index 486acb8f2..c4fe53eb1 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCaseParts.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCaseParts.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
using Arkivverket.Arkade.Core.Noark5;
using Arkivverket.Arkade.Resources;
using Arkivverket.Arkade.Util;
@@ -21,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfCaseParts;
+ return Noark5TestNames.NumberOfCaseParts;
}
public override TestType GetTestType()
@@ -44,7 +43,7 @@ protected override List GetTestResults()
if (casePartCount.Value > 0)
{
var testResult = new TestResult(ResultType.Success, new Location(string.Empty),
- string.Format(Noark5Messages.NumberOfCasePartsMessage, casePartCount.Key,
+ string.Format(Noark5Messages.NumberOf_PerArchivePart, casePartCount.Key,
casePartCount.Value));
testResults.Add(testResult);
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfChangesLogged.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfChangesLogged.cs
index c11e27fe0..489bf7984 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfChangesLogged.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfChangesLogged.cs
@@ -26,7 +26,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfChangesLogged;
+ return Noark5TestNames.NumberOfChangesLogged;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClasses.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClasses.cs
index 5697a911e..a717b4844 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClasses.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClasses.cs
@@ -18,7 +18,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfClasses;
+ return Noark5TestNames.NumberOfClasses;
}
protected override string GetResultMessage()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesFoldersOrRegistrations.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesFoldersOrRegistrations.cs
new file mode 100644
index 000000000..8b7379db4
--- /dev/null
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesFoldersOrRegistrations.cs
@@ -0,0 +1,118 @@
+using System.Collections.Generic;
+using System.Linq;
+using Arkivverket.Arkade.Core.Noark5;
+using Arkivverket.Arkade.Resources;
+using Arkivverket.Arkade.Util;
+
+namespace Arkivverket.Arkade.Tests.Noark5
+{
+ public class NumberOfClassesInMainClassificationSystemWithoutSubClassesFoldersOrRegistrations
+ : Noark5XmlReaderBaseTest
+ {
+ private readonly TestId _id = new TestId(TestId.TestKind.Noark5, 9);
+
+ private readonly Stack _classes = new Stack();
+ private readonly Dictionary _emptyClassPerArchivePart = new Dictionary();
+ private bool _hasPassedMainClassificationSystemForArchivePart;
+
+ public override TestId GetId()
+ {
+ return _id;
+ }
+
+ public override string GetName()
+ {
+ return Noark5TestNames.NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders;
+ }
+
+ public override TestType GetTestType()
+ {
+ return TestType.ContentAnalysis;
+ }
+
+ protected override List GetTestResults()
+ {
+ var testResults = new List();
+
+ if (_emptyClassPerArchivePart.Count > 1)
+ {
+ foreach (KeyValuePair emptyClassForArchivePart in _emptyClassPerArchivePart)
+ {
+ string message = string.Format(
+ Noark5Messages.NumberOf_PerArchivePart,
+ emptyClassForArchivePart.Key,
+ emptyClassForArchivePart.Value
+ );
+
+ testResults.Add(new TestResult(ResultType.Success, Location.Archive, message));
+ }
+ }
+ else
+ {
+ testResults.Add(new TestResult(ResultType.Success, Location.Archive,
+ _emptyClassPerArchivePart.First().Value.ToString()));
+ }
+
+ return testResults;
+ }
+
+ protected override void ReadStartElementEvent(object sender, ReadElementEventArgs eventArgs)
+ {
+ if (_hasPassedMainClassificationSystemForArchivePart)
+ return;
+
+ if (IsClassFolderOrRegistration(eventArgs) && _classes.Any())
+ _classes.Peek().IsCountable = false;
+
+ if (eventArgs.NameEquals("klasse"))
+ _classes.Push(new Class {IsCountable = true});
+ }
+
+ protected override void ReadAttributeEvent(object sender, ReadElementEventArgs eventArgs)
+ {
+ }
+
+ protected override void ReadElementValueEvent(object sender, ReadElementEventArgs eventArgs)
+ {
+ if (eventArgs.Path.Matches("systemID", "arkivdel"))
+ {
+ _emptyClassPerArchivePart.Add(eventArgs.Value, 0);
+
+ _hasPassedMainClassificationSystemForArchivePart = false;
+ }
+ }
+
+ protected override void ReadEndElementEvent(object sender, ReadElementEventArgs eventArgs)
+ {
+ if (_hasPassedMainClassificationSystemForArchivePart)
+ return;
+
+ if (eventArgs.NameEquals("klasse"))
+ {
+ Class currentClass = _classes.Pop();
+
+ if (currentClass.IsCountable)
+ {
+ string currentArchivePartId = _emptyClassPerArchivePart.Keys.Last();
+
+ _emptyClassPerArchivePart[currentArchivePartId]++;
+ }
+ }
+
+ if (eventArgs.NameEquals("klassifikasjonssystem"))
+ _hasPassedMainClassificationSystemForArchivePart = true;
+ }
+
+ private static bool IsClassFolderOrRegistration(ReadElementEventArgs eventArgs)
+ {
+ return eventArgs.NameEquals("klasse")
+ || eventArgs.NameEquals("mappe")
+ || eventArgs.NameEquals("registrering");
+ }
+
+ private class Class
+ {
+ public bool IsCountable { get; set; }
+ }
+ }
+}
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders.cs
deleted file mode 100644
index d4260e316..000000000
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System.Collections.Generic;
-using Arkivverket.Arkade.Core.Noark5;
-using Arkivverket.Arkade.Resources;
-using Arkivverket.Arkade.Util;
-
-namespace Arkivverket.Arkade.Tests.Noark5
-{
- public class NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders : Noark5XmlReaderBaseTest
- {
- private readonly TestId _id = new TestId(TestId.TestKind.Noark5, 9);
-
- private int _classesWithoutSubClassOrFolder;
- private bool _foundSubClassOrFolder;
- private bool _isInsideClass;
- private bool _isInsideMainClassificationSystem;
- private bool _testingIsFinished;
-
- public override TestId GetId()
- {
- return _id;
- }
-
- public override string GetName()
- {
- return Noark5Messages.NumberOfClassesInMainClassificationSystemWithoutSubClassesorFolders;
- }
-
- public override TestType GetTestType()
- {
- return TestType.ContentAnalysis;
- }
-
- protected override List GetTestResults()
- {
- return new List
- {
- new TestResult(ResultType.Success, Location.Archive, "" + _classesWithoutSubClassOrFolder)
- };
- }
-
- protected override void ReadStartElementEvent(object sender, ReadElementEventArgs eventArgs)
- {
- if (_testingIsFinished)
- {
- return;
- }
-
- if (!_isInsideMainClassificationSystem
- && eventArgs.NameEquals("klassifikasjonssystem")
- && eventArgs.Path.Matches("klassifikasjonssystem", "arkivdel", "arkiv"))
- {
- _isInsideMainClassificationSystem = true;
- }
-
- if (eventArgs.NameEquals("klasse")
- && eventArgs.Path.Matches("klasse", "klassifikasjonssystem"))
- {
- _isInsideClass = true;
- }
-
- if ((_isInsideClass
- && eventArgs.Path.Matches("klasse", "klasse", "klassifikasjonssystem"))
- || eventArgs.Path.Matches("mappe", "klasse", "klassifikasjonssystem"))
- {
- _foundSubClassOrFolder = true;
- }
- }
-
- protected override void ReadEndElementEvent(object sender, ReadElementEventArgs eventArgs)
- {
- if (_testingIsFinished)
- {
- return;
- }
-
- if (_isInsideClass && (eventArgs.NameEquals("klasse") & eventArgs.Path.Matches("klassifikasjonssystem")))
- {
- _isInsideClass = false;
- if (!_foundSubClassOrFolder)
- {
- _classesWithoutSubClassOrFolder++;
- }
-
- _foundSubClassOrFolder = false;
- }
-
- if (_isInsideMainClassificationSystem && eventArgs.NameEquals("klassifikasjonssystem"))
- {
- _testingIsFinished = true;
- }
- }
-
- protected override void ReadAttributeEvent(object sender, ReadElementEventArgs eventArgs)
- {
- }
-
- protected override void ReadElementValueEvent(object sender, ReadElementEventArgs eventArgs)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassificationSystems.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassificationSystems.cs
index 2cf9233c6..cc211201e 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassificationSystems.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassificationSystems.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfClassificationSystems;
+ return Noark5TestNames.NumberOfClassificationSystems;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassifications.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassifications.cs
index 921b11708..8c56157fc 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassifications.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfClassifications.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfClassifications;
+ return Noark5TestNames.NumberOfClassifications;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfComments.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfComments.cs
index b60132aba..72b603328 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfComments.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfComments.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfComments;
+ return Noark5TestNames.NumberOfComments;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfConversions.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfConversions.cs
index 8696eaa64..3f110ec5e 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfConversions.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfConversions.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfConversions;
+ return Noark5TestNames.NumberOfConversions;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCorrespondenceParts.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCorrespondenceParts.cs
index c77c66e02..2aff8c481 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCorrespondenceParts.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCorrespondenceParts.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfCorrespondenceParts;
+ return Noark5TestNames.NumberOfCorrespondenceParts;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCrossReferences.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCrossReferences.cs
index 60cf56e1f..c6abb8d18 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCrossReferences.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfCrossReferences.cs
@@ -19,7 +19,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfCrossReferences;
+ return Noark5TestNames.NumberOfCrossReferences;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDepreciations.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDepreciations.cs
index f76c7414d..bbf821612 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDepreciations.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDepreciations.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDepreciations;
+ return Noark5TestNames.NumberOfDepreciations;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalResolutions.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalResolutions.cs
index 46e61ae22..15f0731e1 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalResolutions.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalResolutions.cs
@@ -31,7 +31,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDisposalResolutions;
+ return Noark5TestNames.NumberOfDisposalResolutions;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalsExecuted.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalsExecuted.cs
index 8f57b6e6b..e9c1e94a8 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalsExecuted.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDisposalsExecuted.cs
@@ -29,7 +29,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDisposalsExecuted;
+ return Noark5TestNames.NumberOfDisposalsExecuted;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptions.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptions.cs
index f45811024..9ca7bd56d 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptions.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptions.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDocumentDescriptions;
+ return Noark5TestNames.NumberOfDocumentDescriptions;
}
public override TestType GetTestType()
@@ -41,7 +41,7 @@ protected override List GetTestResults()
foreach (KeyValuePair documentDescriptionCount in _documentDescriptionsPerArchivePart)
{
var testResult = new TestResult(ResultType.Success, new Location(string.Empty),
- string.Format(Noark5Messages.NumberOfDocumentDescriptionsPerArchivePartMessage,
+ string.Format(Noark5Messages.NumberOf_PerArchivePart,
documentDescriptionCount.Key, documentDescriptionCount.Value));
testResults.Add(testResult);
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptionsWithoutDocumentObject.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptionsWithoutDocumentObject.cs
index e0107bef7..211aec5ab 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptionsWithoutDocumentObject.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentDescriptionsWithoutDocumentObject.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDocumentDescriptionsWithoutDocumentObject;
+ return Noark5TestNames.NumberOfDocumentDescriptionsWithoutDocumentObject;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentFlows.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentFlows.cs
index f29482ece..309a45a25 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentFlows.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentFlows.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDocumentFlows;
+ return Noark5TestNames.NumberOfDocumentFlows;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentObjects.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentObjects.cs
index a620bf377..55d8920de 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentObjects.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfDocumentObjects.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfDocumentObjects;
+ return Noark5TestNames.NumberOfDocumentObjects;
}
public override TestType GetTestType()
@@ -42,7 +42,7 @@ protected override List GetTestResults()
if (documentObjectsCount.Value > 0)
{
var testresult = new TestResult(ResultType.Success, new Location(string.Empty),
- string.Format(Noark5Messages.NumberOfDocumentObjectsMessage, documentObjectsCount.Key,
+ string.Format(Noark5Messages.NumberOf_PerArchivePart, documentObjectsCount.Key,
documentObjectsCount.Value));
testResults.Add(testresult);
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachCaseFolderStatus.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachCaseFolderStatus.cs
index 19f4e27e2..10e82beb3 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachCaseFolderStatus.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachCaseFolderStatus.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfEachCaseFolderStatus;
+ return Noark5TestNames.NumberOfEachCaseFolderStatus;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentFormat.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentFormat.cs
index 0f8e23f50..f112fe866 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentFormat.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentFormat.cs
@@ -23,7 +23,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfEachDocumentFormat;
+ return Noark5TestNames.NumberOfEachDocumentFormat;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentStatus.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentStatus.cs
index caff21657..dc7cc9395 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentStatus.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachDocumentStatus.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfEachDocumentStatus;
+ return Noark5TestNames.NumberOfEachDocumentStatus;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalPostType.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalPostType.cs
index 775c41bdd..f73a93afc 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalPostType.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalPostType.cs
@@ -25,7 +25,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfEachJournalPostType;
+ return Noark5TestNames.NumberOfEachJournalPostType;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalStatus.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalStatus.cs
index c850905f6..e8ab542c8 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalStatus.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfEachJournalStatus.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfEachJournalStatus;
+ return Noark5TestNames.NumberOfEachJournalStatus;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFolders.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFolders.cs
index a231b2def..82b2cc6e7 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFolders.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFolders.cs
@@ -18,7 +18,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfFolders;
+ return Noark5TestNames.NumberOfFolders;
}
protected override string GetResultMessage()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerClass.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerClass.cs
index 05d02d0ae..54304159b 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerClass.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerClass.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfFoldersPerClass;
+ return Noark5TestNames.NumberOfFoldersPerClass;
}
public override TestType GetTestType()
@@ -67,7 +67,7 @@ protected override void ReadStartElementEvent(object sender, ReadElementEventArg
if (eventArgs.NameEquals("klasse"))
_currentClass = new Class {ArchivePartSystemId = _currentArchivePartSystemId};
- if (eventArgs.Path.Matches("mappe", "klasse"))
+ if (eventArgs.Path.Matches("mappe", "klasse") && _currentClass != null)
_currentClass.NumberOfFolders++;
}
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerYear.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerYear.cs
index 34e7c014d..dcc2d8b0a 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerYear.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersPerYear.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfFoldersPerYear;
+ return Noark5TestNames.NumberOfFoldersPerYear;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersWithoutRegistrationsOrSubfolders.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersWithoutRegistrationsOrSubfolders.cs
index 0c607ecac..1d3aabab7 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersWithoutRegistrationsOrSubfolders.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfFoldersWithoutRegistrationsOrSubfolders.cs
@@ -24,7 +24,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfFoldersWithoutRegistrationsOrSubfolders;
+ return Noark5TestNames.NumberOfFoldersWithoutRegistrationsOrSubfolders;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfJournalPosts.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfJournalPosts.cs
index 3ef50e8f6..61b15d01f 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfJournalPosts.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfJournalPosts.cs
@@ -43,7 +43,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfJournalPosts;
+ return Noark5TestNames.NumberOfJournalPosts;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfMultiReferencedDocumentFiles.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfMultiReferencedDocumentFiles.cs
index ee47834a4..00468a0e7 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfMultiReferencedDocumentFiles.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfMultiReferencedDocumentFiles.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfMultiReferencedDocumentFiles;
+ return Noark5TestNames.NumberOfMultiReferencedDocumentFiles;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfPrecedents.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfPrecedents.cs
index fc1c99833..031f2568f 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfPrecedents.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfPrecedents.cs
@@ -27,7 +27,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfPrecedents;
+ return Noark5TestNames.NumberOfPrecedents;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrations.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrations.cs
index 1a675e88d..ea4586913 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrations.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrations.cs
@@ -19,7 +19,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfRegistrations;
+ return Noark5TestNames.NumberOfRegistrations;
}
protected override string GetResultMessage()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerClass.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerClass.cs
index a4e9e2484..752bc8cac 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerClass.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerClass.cs
@@ -22,7 +22,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfRegistrationsPerClass;
+ return Noark5TestNames.NumberOfRegistrationsPerClass;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerYear.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerYear.cs
index 83b07cba5..8f39515fb 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerYear.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsPerYear.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfRegistrationsPerYear;
+ return Noark5TestNames.NumberOfRegistrationsPerYear;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsWithoutDocumentDescription.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsWithoutDocumentDescription.cs
index 9880239f4..e7cf5f897 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsWithoutDocumentDescription.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRegistrationsWithoutDocumentDescription.cs
@@ -21,7 +21,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfRegistrationsWithoutDocumentDescription;
+ return Noark5TestNames.NumberOfRegistrationsWithoutDocumentDescription;
}
public override TestType GetTestType()
@@ -43,7 +43,7 @@ protected override List GetTestResults()
if (noDocumentDescriptionCount.Value > 0)
{
var testResult = new TestResult(ResultType.Success, new Location(string.Empty), string.Format(
- Noark5Messages.NumberOfRegistrationsWithoutDocumentDescription_ForArchivePart,
+ Noark5Messages.NumberOf_PerArchivePart,
noDocumentDescriptionCount.Key, noDocumentDescriptionCount.Value));
testResults.Add(testResult);
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRestrictions.cs b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRestrictions.cs
index a7957af5e..4a09d7ccf 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRestrictions.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/NumberOfRestrictions.cs
@@ -33,7 +33,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.NumberOfRestrictions;
+ return Noark5TestNames.NumberOfRestrictions;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/StatusOfArchiveParts.cs b/src/Arkivverket.Arkade/Tests/Noark5/StatusOfArchiveParts.cs
index a0846bdd3..a491195d0 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/StatusOfArchiveParts.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/StatusOfArchiveParts.cs
@@ -20,7 +20,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.StatusOfArchiveParts;
+ return Noark5TestNames.StatusOfArchiveParts;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateAddmlDataobjectsChecksums.cs b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateAddmlDataobjectsChecksums.cs
index ee72af5fb..7e2e24082 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateAddmlDataobjectsChecksums.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateAddmlDataobjectsChecksums.cs
@@ -18,7 +18,7 @@ public class ValidateAddmlDataobjectsChecksums : Noark5StructureBaseTest
public override void Test(Archive archive)
{
- var structure = SerializeUtil.DeserializeFromFile(archive.GetStructureDescriptionFileName());
+ var structure = SerializeUtil.DeserializeFromFile(archive.AddmlFile.FullName);
foreach (var entry in structure.dataset[0].dataObjects.dataObject)
{
@@ -88,7 +88,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ValidateAddmlDataobjectsChecksums;
+ return Noark5TestNames.ValidateAddmlDataobjectsChecksums;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateNumberOfDocumentfiles.cs b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateNumberOfDocumentfiles.cs
index e53ab72e1..ff80a169e 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateNumberOfDocumentfiles.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateNumberOfDocumentfiles.cs
@@ -23,7 +23,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ValidateNumberOfDocumentfiles;
+ return Noark5TestNames.ValidateNumberOfDocumentfiles;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateXmlWithSchema.cs b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateXmlWithSchema.cs
index 9fd0a4b86..dc0b36465 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateXmlWithSchema.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/Structure/ValidateXmlWithSchema.cs
@@ -18,39 +18,37 @@ public class ValidateXmlWithSchema : Noark5StructureBaseTest
{
private readonly TestId _id = new TestId(TestId.TestKind.Noark5, 3);
- private readonly IArchiveContentReader _archiveReader;
private readonly List _testResults = new List();
- public ValidateXmlWithSchema(IArchiveContentReader archiveReader)
- {
- _archiveReader = archiveReader;
- }
-
public override void Test(Archive archive)
{
- ValidateXml(archive.GetStructureDescriptionFileName(), _archiveReader.GetStructureContentAsStream(archive),
+ ValidateXml(archive.AddmlFile.FullName, archive.AddmlFile.AsStream(),
GetStructureDescriptionXmlSchemaStream(archive));
- ValidateXml(archive.GetContentDescriptionFileName(), _archiveReader.GetContentAsStream(archive),
+ ValidateXml(archive.ArchiveStructureFile.FullName, archive.ArchiveStructureFile.AsStream(),
GetContentDescriptionXmlSchemaStream(archive), GetMetadataCatalogXmlSchemaStream(archive));
+
+ if (Noark5TestHelper.FileIsDescribed(ArkadeConstants.PublicJournalXmlFileName, archive))
+ ValidateXml(archive.PublicJournalFile.FullName, archive.PublicJournalFile.AsStream(),
+ GetPublicJournalXmlSchemaStream(archive), GetMetadataCatalogXmlSchemaStream(archive));
+
+ if (Noark5TestHelper.FileIsDescribed(ArkadeConstants.RunningJournalXmlFileName, archive))
+ ValidateXml(archive.RunningJournalFile.FullName, archive.RunningJournalFile.AsStream(),
+ GetRunningJournalXmlSchemaStream(archive), GetMetadataCatalogXmlSchemaStream(archive));
}
private void ValidateXml(string fullPathToFile, Stream fileStream, params Stream[] xsdResources)
{
string fileName = Path.GetFileName(fullPathToFile);
+
+ // Use the Noark 5 archive filename for testresults:
+ if (fileName.Equals(ArkadeConstants.AddmlXmlFileName))
+ fileName = ArkadeConstants.ArkivuttrekkXmlFileName;
+
try
{
- List validationErrorMessages = new XmlValidator().Validate(fileStream, xsdResources);
- if (validationErrorMessages.Any())
- foreach (string validationErrorMessage in validationErrorMessages)
- {
- _testResults.Add(new TestResult(ResultType.Error, new Location(string.Empty),
- string.Format(Noark5Messages.XmlDoesNotValidateWithSchema,
- fileName, validationErrorMessage)));
- }
- else
- _testResults.Add(new TestResult(ResultType.Success, new Location(fileName),
- Noark5Messages.ValidateXmlWithSchemaMessageValid));
+ foreach (string validationErrorMessage in new XmlValidator().Validate(fileStream, xsdResources))
+ _testResults.Add(new TestResult(ResultType.Error, new Location(fileName), validationErrorMessage));
}
catch (Exception e)
{
@@ -61,8 +59,8 @@ private void ValidateXml(string fullPathToFile, Stream fileStream, params Stream
private Stream GetStructureDescriptionXmlSchemaStream(Archive archive)
{
- if (archive.HasStructureDescriptionXmlSchema())
- return _archiveReader.GetStructureDescriptionXmlSchemaAsStream(archive);
+ if (archive.AddmlSchemaFile.Exists)
+ return archive.AddmlSchemaFile.AsStream();
// Fallback on internal addml.xsd:
@@ -75,8 +73,8 @@ private Stream GetStructureDescriptionXmlSchemaStream(Archive archive)
private Stream GetContentDescriptionXmlSchemaStream(Archive archive)
{
- if (archive.HasContentDescriptionXmlSchema())
- return _archiveReader.GetContentDescriptionXmlSchemaAsStream(archive);
+ if (archive.ArchiveStructureSchemaFile.Exists)
+ return archive.ArchiveStructureSchemaFile.AsStream();
// Fallback on internal arkivstruktur.xsd:
@@ -89,8 +87,8 @@ private Stream GetContentDescriptionXmlSchemaStream(Archive archive)
private Stream GetMetadataCatalogXmlSchemaStream(Archive archive)
{
- if (archive.HasMetadataCatalogXmlSchema())
- return _archiveReader.GetMetadataCatalogXmlSchemaAsStream(archive);
+ if (archive.MetadataCatalogSchemaFile.Exists)
+ return archive.MetadataCatalogSchemaFile.AsStream();
// Fallback on internal metadatakatalog.xsd:
@@ -101,6 +99,34 @@ private Stream GetMetadataCatalogXmlSchemaStream(Archive archive)
return ResourceUtil.GetResourceAsStream(ArkadeConstants.MetadatakatalogXsdResource);
}
+ private Stream GetPublicJournalXmlSchemaStream(Archive archive)
+ {
+ if (archive.PublicJournalSchemaFile.Exists)
+ return archive.PublicJournalSchemaFile.AsStream();
+
+ // Fallback on internal schema for public journal:
+
+ _testResults.Add(new TestResult(ResultType.Error, new Location(string.Empty),
+ // TODO: Consider ResultType.Warning (if it becomes supported)
+ string.Format(Noark5Messages.InternalSchemaFileIsUsed, ArkadeConstants.PublicJournalXsdFileName)));
+
+ return ResourceUtil.GetResourceAsStream(ArkadeConstants.PublicJournalXsdResource);
+ }
+
+ private Stream GetRunningJournalXmlSchemaStream(Archive archive)
+ {
+ if (archive.RunningJournalSchemaFile.Exists)
+ return archive.RunningJournalSchemaFile.AsStream();
+
+ // Fallback on internal schema for running journal:
+
+ _testResults.Add(new TestResult(ResultType.Error, new Location(string.Empty),
+ // TODO: Consider ResultType.Warning (if it becomes supported)
+ string.Format(Noark5Messages.InternalSchemaFileIsUsed, ArkadeConstants.RunningJournalXsdFileName)));
+
+ return ResourceUtil.GetResourceAsStream(ArkadeConstants.RunningJournalXsdResource);
+ }
+
public override TestId GetId()
{
return _id;
@@ -108,7 +134,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.ValidateXmlWithSchema;
+ return Noark5TestNames.ValidateXmlWithSchema;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Tests/Noark5/SystemIdUniqueControl.cs b/src/Arkivverket.Arkade/Tests/Noark5/SystemIdUniqueControl.cs
index 633555c19..1f4b4f9c6 100644
--- a/src/Arkivverket.Arkade/Tests/Noark5/SystemIdUniqueControl.cs
+++ b/src/Arkivverket.Arkade/Tests/Noark5/SystemIdUniqueControl.cs
@@ -18,7 +18,7 @@ public override TestId GetId()
public override string GetName()
{
- return Noark5Messages.SystemIdUniqueControl;
+ return Noark5TestNames.SystemIdUniqueControl;
}
public override TestType GetTestType()
diff --git a/src/Arkivverket.Arkade/Util/ArkadeAutofacModule.cs b/src/Arkivverket.Arkade/Util/ArkadeAutofacModule.cs
index 5b0c6f955..efe965902 100644
--- a/src/Arkivverket.Arkade/Util/ArkadeAutofacModule.cs
+++ b/src/Arkivverket.Arkade/Util/ArkadeAutofacModule.cs
@@ -16,7 +16,6 @@ protected override void Load(ContainerBuilder builder)
{
builder.RegisterType().AsSelf();
builder.RegisterType().AsSelf();
- builder.RegisterType().As();
builder.RegisterType().As();
builder.RegisterType().AsSelf();
builder.RegisterType().AsSelf();
diff --git a/src/Arkivverket.Arkade/Util/ArkadeConstants.cs b/src/Arkivverket.Arkade/Util/ArkadeConstants.cs
index 9476329f7..123071ed8 100644
--- a/src/Arkivverket.Arkade/Util/ArkadeConstants.cs
+++ b/src/Arkivverket.Arkade/Util/ArkadeConstants.cs
@@ -2,6 +2,8 @@ namespace Arkivverket.Arkade.Util
{
public class ArkadeConstants
{
+ public const string SystemLogFileNameFormat = "arkade-{Date}.log";
+
public const string NoarkihXmlFileName = "NOARKIH.XML";
public const string AddmlXmlFileName = "addml.xml";
public const string AddmlXsdFileName = "addml.xsd";
@@ -19,7 +21,9 @@ public class ArkadeConstants
public const string LogXmlFileName = "log.xml";
public const string ArkivuttrekkXmlFileName = "arkivuttrekk.xml";
public const string PublicJournalXmlFileName = "offentligJournal.xml";
+ public const string PublicJournalXsdFileName = "offentligJournal.xsd";
public const string RunningJournalXmlFileName = "loependeJournal.xml";
+ public const string RunningJournalXsdFileName = "loependeJournal.xsd";
public const string ChangeLogXmlFileName = "endringslogg.xml";
public const string MetadataPredefinedFieldValuesFileName = "metadata-feltverdier.xml";
@@ -28,6 +32,8 @@ public class ArkadeConstants
public const string MetadatakatalogXsdResource = "Arkivverket.Arkade.ExternalModels.xsd.metadatakatalog.xsd";
public const string DiasPremisXsdResource = "Arkivverket.Arkade.ExternalModels.xsd.DIAS_PREMIS.xsd";
public const string DiasMetsXsdResource = "Arkivverket.Arkade.ExternalModels.xsd.mets.xsd";
+ public const string PublicJournalXsdResource = "Arkivverket.Arkade.ExternalModels.xsd.offentligJournal.xsd";
+ public const string RunningJournalXsdResource = "Arkivverket.Arkade.ExternalModels.xsd.loependeJournal.xsd";
public const string DirectoryNameArkadeProcessingAreaRoot = "Arkade";
public const string DirectoryNameArkadeProcessingAreaWork = "work";
diff --git a/src/Arkivverket.Arkade/Util/ArkadeFile.cs b/src/Arkivverket.Arkade/Util/ArkadeFile.cs
index 957085493..55a66ee33 100644
--- a/src/Arkivverket.Arkade/Util/ArkadeFile.cs
+++ b/src/Arkivverket.Arkade/Util/ArkadeFile.cs
@@ -1,6 +1,36 @@
+using System;
+using System.IO;
+using Arkivverket.Arkade.Core;
+using Arkivverket.Arkade.Resources;
+
namespace Arkivverket.Arkade.Util
{
public class ArkadeFile
{
+ public string Name { get; }
+ public string FullName { get; }
+ public bool Exists { get; }
+
+ public ArkadeFile(FileSystemInfo fileInfo)
+ {
+ Name = fileInfo.Name;
+ FullName = fileInfo.FullName;
+ Exists = fileInfo.Exists;
+ }
+
+ public Stream AsStream()
+ {
+ if (!Exists)
+ throw new ArkadeException(string.Format(ExceptionMessages.FileNotFound, FullName));
+
+ try
+ {
+ return File.OpenRead(FullName);
+ }
+ catch (Exception e)
+ {
+ throw new ArkadeException(string.Format(ExceptionMessages.FileNotRead, FullName), e);
+ }
+ }
}
}
diff --git a/src/Arkivverket.Arkade/Util/Sha256ChecksumGenerator.cs b/src/Arkivverket.Arkade/Util/Sha256ChecksumGenerator.cs
index ffa342b2d..949e04349 100644
--- a/src/Arkivverket.Arkade/Util/Sha256ChecksumGenerator.cs
+++ b/src/Arkivverket.Arkade/Util/Sha256ChecksumGenerator.cs
@@ -13,7 +13,7 @@ public class Sha256ChecksumGenerator : IChecksumGenerator
///
public string GenerateChecksum(string pathToFile)
{
- HashAlgorithm h = HashAlgorithm.Create("SHA256");
+ HashAlgorithm h = (HashAlgorithm) CryptoConfig.CreateFromName("SHA256");
if (h == null)
{
throw new ArkadeException("Checksum algorithm SHA-256 not supported.");
diff --git a/src/Arkivverket.Arkade/Util/SystemInfo.cs b/src/Arkivverket.Arkade/Util/SystemInfo.cs
index 31162d9ac..2948db585 100644
--- a/src/Arkivverket.Arkade/Util/SystemInfo.cs
+++ b/src/Arkivverket.Arkade/Util/SystemInfo.cs
@@ -1,47 +1,11 @@
using System;
using System.IO;
using Arkivverket.Arkade.Core;
-using Microsoft.Win32;
namespace Arkivverket.Arkade.Util
{
public class SystemInfo
{
- public static ulong GetTotalPhysicalMemoryInBytes()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().TotalPhysicalMemory;
- }
-
- public static ulong GetTotalVirtualMemoryInBytes()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().TotalVirtualMemory;
- }
-
- public static ulong GetAvailablePhysicalMemoryInBytes()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().AvailablePhysicalMemory;
- }
-
- public static ulong GetAvailableVirtualMemoryInBytes()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().AvailableVirtualMemory;
- }
-
- public static string GetOsName()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().OSFullName;
- }
-
- public static string GetOsPlatform()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().OSPlatform;
- }
-
- public static string GetOsVersion()
- {
- return new Microsoft.VisualBasic.Devices.ComputerInfo().OSVersion;
- }
-
public static long GetAvailableDiskSpaceInBytes()
{
DirectoryInfo arkadeDirectory = ArkadeProcessingArea.RootDirectory;
@@ -74,18 +38,6 @@ public static long GetTotalDiskSpaceInBytes()
return -1;
}
- public static int GetDotNetFrameworkVersion()
- {
- using (
- RegistryKey ndpKey =
- RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32)
- .OpenSubKey("SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full\\"))
- {
- object value = ndpKey.GetValue("Release");
- return value == null ? -1 : Convert.ToInt32(value);
- }
- }
-
public static string GetDotNetClrVersion()
{
return Environment.Version.ToString();
diff --git a/src/Arkivverket.Arkade/Util/XmlValidator.cs b/src/Arkivverket.Arkade/Util/XmlValidator.cs
index 99671ecde..cee15246f 100644
--- a/src/Arkivverket.Arkade/Util/XmlValidator.cs
+++ b/src/Arkivverket.Arkade/Util/XmlValidator.cs
@@ -67,7 +67,11 @@ private XmlReaderSettings SetupXmlValidation(IEnumerable xmlSchemas)
private void ValidationCallBack(object sender, ValidationEventArgs args)
{
- _validationErrorMessages.Add(args.Message);
+ _validationErrorMessages.Add(string.Format(
+ Resources.ExceptionMessages.XmlValidationErrorMessage,
+ args.Exception.LineNumber,
+ args.Message
+ ));
}
}
}
diff --git a/src/Arkivverket.Arkade/app.config b/src/Arkivverket.Arkade/app.config
deleted file mode 100644
index cd844f7ef..000000000
--- a/src/Arkivverket.Arkade/app.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Arkivverket.Arkade/packages.config b/src/Arkivverket.Arkade/packages.config
deleted file mode 100644
index 70220f137..000000000
--- a/src/Arkivverket.Arkade/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file