diff --git a/src/main/java/org/roda_project/commons_ip2/validator/components/sipMetsRootComponent/sipMetsHdrComponent/SipMetsHdrValidator.java b/src/main/java/org/roda_project/commons_ip2/validator/components/sipMetsRootComponent/sipMetsHdrComponent/SipMetsHdrValidator.java index 47db6d70..5d37b663 100644 --- a/src/main/java/org/roda_project/commons_ip2/validator/components/sipMetsRootComponent/sipMetsHdrComponent/SipMetsHdrValidator.java +++ b/src/main/java/org/roda_project/commons_ip2/validator/components/sipMetsRootComponent/sipMetsHdrComponent/SipMetsHdrValidator.java @@ -138,22 +138,14 @@ protected ReporterDetails validateSIP6(final MetsValidatorState metsValidatorSta */ protected ReporterDetails validateSIP7(final MetsValidatorState metsValidatorState, final MetsType.MetsHdr metsHdr) { final List altRecordIDS = metsHdr.getAltRecordID(); - boolean found = false; int count = 0; if (altRecordIDS != null && !altRecordIDS.isEmpty()) { for (MetsType.MetsHdr.AltRecordID altRecordID : altRecordIDS) { final String type = altRecordID.getTYPE(); if ("REFERENCECODE".equals(type)) { - found = true; count++; } } - if (!found) { - return new ReporterDetails(getSIPVersion(), - Message.createErrorMessage("metsHdr/altRecordID with the @TYPE “REFERENCECODE” not found in %1$s", - metsValidatorState.getMetsName(), metsValidatorState.isRootMets()), - false, false); - } if (count > 1) { return new ReporterDetails(getSIPVersion(), Message.createErrorMessage("Can't have more than one metsHdr/altRecordID of the type REFERENCECODE", diff --git a/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator204.java b/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator204.java index a4c91f09..18789c86 100644 --- a/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator204.java +++ b/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator204.java @@ -91,10 +91,6 @@ public Map validate(final StructureValidatorState struc ResultsUtils.addResult(results, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, generator.validateCSIP85(metsValidatorState).setSpecification(generator.getCSIPVersion())); - /* CSIP86 */ - notifyObserversValidationStarted(moduleName, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID); - ResultsUtils.addResult(results, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, - generator.validateCSIP86(metsValidatorState).setSpecification(generator.getCSIPVersion())); /* CSIP88 */ notifyObserversValidationStarted(moduleName, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID); @@ -313,7 +309,6 @@ public Map validate(final StructureValidatorState struc ResultsUtils.addResults(results, new ReporterDetails(generator.getCSIPVersion(), message, true, true), ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, - ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP89_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP90_ID, @@ -352,7 +347,6 @@ public Map validate(final StructureValidatorState struc ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP83_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP84_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, - ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP89_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP90_ID, @@ -392,7 +386,6 @@ public Map validate(final StructureValidatorState struc ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP83_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP84_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, - ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP89_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP90_ID, diff --git a/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator210.java b/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator210.java index b9c6e153..d9383ecd 100644 --- a/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator210.java +++ b/src/main/java/org/roda_project/commons_ip2/validator/components/structuralMapComponent/StructuralMapComponentValidator210.java @@ -310,7 +310,6 @@ public Map validate(final StructureValidatorState struc ResultsUtils.addResults(results, new ReporterDetails(generator.getCSIPVersion(), message, true, true), ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, - ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP89_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP90_ID, @@ -349,7 +348,6 @@ public Map validate(final StructureValidatorState struc ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP83_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP84_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP85_ID, - ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP86_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP88_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP89_ID, ConstantsCSIPspec.VALIDATION_REPORT_SPECIFICATION_CSIP90_ID, diff --git a/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsCSIPspec.java b/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsCSIPspec.java index 0e385e33..6fc3fdd5 100644 --- a/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsCSIPspec.java +++ b/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsCSIPspec.java @@ -623,12 +623,16 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP1". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP1_DESCRIPTION = "The mets/@OBJID attribute " - + "is mandatory, " + "its value is a string identifier for " - + "the METS document. For the package METS document, this should be the " - + "name/ID of the package, i.e. the name of the package root folder. For a " - + "representation level METS document this value records the name/ID of the " - + "representation, i.e. the name of the top-level representation folder."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP1_DESCRIPTION = "The mets/@OBJID attribute is mandatory, " + + "its value is a string identifier for the METS document. " + "For the package METS document following CSIPSTR2, " + + "this should be the name/ID of the package, i.e. the name of the " + + "package root folder. For a representation level METS document this " + + "value records the name/ID of the representation following CSIPSTR10, " + + "i.e. the name of the top-level representation folder. Observe that the " + + "name/ID used in the mets/@OBJID attribute might not be possible to directly " + + "transform into a folder name due to limitations in the used file system. " + + "If there are illegal characters present there are different character mapping " + + "techniques to use to transform the mets/@OBJID into a valid folder name."; /** * Constant specification cardinality for id "CSIP1". @@ -699,8 +703,10 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP3". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP3_DESCRIPTION = "When the mets/@TYPE attribute " - + "has the value “OTHER” the " + "mets/@csip:OTHERTYPE attribute MUST be used to declare the content " - + "category of the package/representation."; + + "has the value “OTHER” the mets/@csip:OTHERTYPE attribute MUST be used to declare " + + "the content category of the package/representation. The value can " + + "either be “OTHER” or any other string that are not present in the " + + "vocabulary used in the mets/@TYPE attribute."; /** * Constant specification cardinality for id "CSIP3". @@ -732,12 +738,12 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP4". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP4_DESCRIPTION = "Used to declare the " - + "Content Information " + "Type Specification used when " - + "creating the package. Legal values are defined in a fixed vocabulary. The " - + "attribute is mandatory for representation level METS documents. The " - + "vocabulary will evolve under the care of the DILCIS Board as additional " - + "Content Information Type Specifications are developed."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP4_DESCRIPTION = "Used to declare the Content " + + "Information Type Specification used when creating the package. " + + "Legal values are defined in a fixed vocabulary. The attribute " + + "is mandatory for representation level METS documents. The " + + "vocabulary will evolve under the care of the DILCIS Board " + + "as additional Content Information Type Specifications are developed."; /** * Constant specification cardinality for id "CSIP4". @@ -971,9 +977,13 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP10". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP10_DESCRIPTION = "A mandatory agent element records " - + "the software used to create the package. " + "Other uses of agents may be described in any local " - + "implementations that extend the profile."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP10_DESCRIPTION = "A mandatory agent element records " + + "the software used to create the package. Other uses " + + "of agents may be described in any local implementations " + + "that extend the profile. It is possible according to METS " + + "to use more note elements but in this implementation " + + "for this agent describing the software used it is one " + + "mandatory note for describing the version of the software."; /** * Constant specification cardinality for id "CSIP10". @@ -1244,9 +1254,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP18". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP18_DESCRIPTION = "An xml:id identifier for the " - + "descriptive metadata section ( ) " - + "used for internal package references. It must be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP18_DESCRIPTION = "An xml:id identifier for the " + + "descriptive metadata section () used for internal " + + "references within the XML-document. It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP18". @@ -1511,8 +1521,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP26". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP26_DESCRIPTION = "The IANA mime type of " - + "the referenced file."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP26_DESCRIPTION = "The mime type of the referenced file.\n" + + "It is a strong recommendation to use a qualified list like the IANA Media Type list.\n" + + "Another list can be used following a documented agreement between the sender and the receiver."; /** * Constant specification cardinality for id "CSIP26". @@ -1751,9 +1762,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP33". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP33_DESCRIPTION = "An xml:id identifier " - + "for the digital provenance metadata section " - + "mets/amdSec/digiprovMD used for internal package references. It must " + "be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP33_DESCRIPTION = "An xml:id identifier for the " + + "digital provenance metadata section mets/amdSec/digiprovMD " + + "used for internal references within the XML-document. It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP33". @@ -1785,8 +1796,8 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP34". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP34_DESCRIPTION = "Indicates the status of " - + "the package using a fixed vocabulary."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP34_DESCRIPTION = "Indicates the status of the " + + "package using a fixed vocabulary."; /** * Constant specification cardinality for id "CSIP34". @@ -1988,8 +1999,10 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP40". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP40_DESCRIPTION = "The IANA mime type " - + "for the referenced file."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP40_DESCRIPTION = "The mime type of the referenced" + + " file.\n" + "It is a strong recommendation to use a qualified " + + "list like the IANA Media Type list.\n" + + "Another list can be used following a documented agreement between the sender and the receiver."; /** * Constant specification cardinality for id "CSIP40". @@ -2193,9 +2206,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP46". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP46_DESCRIPTION = "An xml:id identifier for the " - + "rights metadata section ( ) " - + "used for internal package references. It must be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP46_DESCRIPTION = "An xml:id identifier for the " + + "rights metadata section () used for internal " + + "references within the XML-document. It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP46". @@ -2427,8 +2440,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP53". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP53_DESCRIPTION = "The IANA mime " - + "type for the referenced file."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP53_DESCRIPTION = "The mime type of the " + + "referenced file.\n" + "It is a strong recommendation to use a qualified list like the IANA Media Type list.\n" + + "Another list can be used following a documented agreement between the sender and the receiver."; /** * Constant specification cardinality for id "CSIP53". @@ -2631,8 +2645,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP59". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP59_DESCRIPTION = "An xml:id identifier for " - + "the file section used for internal package references. " + "It must be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP59_DESCRIPTION = "An xml:id identifier for the " + + "file section used for internal references within the XML-document. " + + "It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP59". @@ -2701,7 +2716,7 @@ private ConstantsCSIPspec() { */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP113_DESCRIPTION = "All XML schemas used " + "in the information package should be referenced from " - + "one or more file groups with mets/fileSec/fileGrp/@USE attribute value "; + + "one or more file groups with mets/fileSec/fileGrp/@USE attribute value “Schemas”."; /** * Constant specification cardinality for id "CSIP113". @@ -2734,10 +2749,13 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP114". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP114_DESCRIPTION = "A pointer to the METS document " - + "describing the representation or pointers to " - + "the content being transferred must be present in one or more file groups " - + "with mets/fileSec/fileGrp/@USE attribute value “Representations”.See " + "also: File group names"; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP114_DESCRIPTION = "A pointer to the METS document " + + "describing the representation or pointers to " + + "the content being transferred must be present in one " + + "or more file groups with mets/fileSec/fileGrp/@USE " + + "attribute value starting with “Representations” followed " + + "by the path to the folder where the representation level " + + "METS document is placed. For example “Representation/submission” and “Representation/ingest”."; /** * Constant specification cardinality for id "CSIP114". @@ -2910,8 +2928,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP65". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP65_DESCRIPTION = "An xml:id identifier " - + "for the file group used for internal package references. " + "It must be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP65_DESCRIPTION = "An xml:id identifier for " + + "the file group used for internal references within " + + "the XML-document. It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP65". @@ -2975,7 +2994,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP67". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP67_DESCRIPTION = "A unique xml:id identifier " - + "for this file across the package."; + + "for this file within the XML-document."; /** * Constant specification cardinality for id "CSIP67". @@ -3007,8 +3026,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP60". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP68_DESCRIPTION = "The IANA mime type " - + "for the referenced file."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP68_DESCRIPTION = "The mime type of the referenced " + + "file.\n" + "It is a strong recommendation to use a qualified list like the IANA Media Type list.\n" + + "Another list can be used following a documented agreement between the sender and the receiver."; /** * Constant specification cardinality for id "CSIP60". @@ -3480,8 +3500,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP82". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP82_DESCRIPTION = "The mets/structMap/@LABEL " - + "attribute value is set to “CSIP” from the " + "vocabulary."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP82_DESCRIPTION = "The mets/structMap/@LABEL " + + "attribute value is set to “CSIP” from the vocabulary.\n" + + "This requirement identifies the CSIP compliant structural map element."; /** * Constant specification cardinality for id "CSIP82". @@ -3513,9 +3534,9 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP83". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP83_DESCRIPTION = "An xml:id identifier " - + "for the structural description (structMap) used for " - + "internal package references. It must be unique within the package."; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP83_DESCRIPTION = "An xml:id identifier for " + + "the structural description (structMap) used for " + + "internal references within the XML-document. It must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP83". @@ -3581,7 +3602,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP85". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP85_DESCRIPTION = "Mandatory, xml:id " - + "identifier must be unique within the package."; + + "identifier must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP85". @@ -3593,42 +3614,6 @@ private ConstantsCSIPspec() { */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP85_LEVEL = "MUST"; - /* CSIP86 */ - - /** - * Constant specification id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_ID = "CSIP86"; - - /** - * Constant specification name for id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_NAME = "Main structural division label"; - - /** - * Constant specification location for id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_LOCATION = "mets/structMap[@LABEL=’CSIP’]" - + "/div/@LABEL"; - - /** - * Constant specification description for id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_DESCRIPTION = "The package’s top-level " - + "structural division
" + "element’s @LABEL " - + "attribute value must be identical to the package identifier, i.e. the same " - + "value as the mets/@OBJID attribute."; - - /** - * Constant specification cardinality for id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_CARDINALITY = "1..1"; - - /** - * Constant specification level for id "CSIP86". - */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP86_LEVEL = "MUST"; - /* CSIP88 */ /** * Constant specification id "CSIP88". @@ -3687,7 +3672,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP89". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP89_DESCRIPTION = "Mandatory, xml:id identifier " - + "must be unique within the package."; + + "must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP89". @@ -3863,7 +3848,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP94". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP94_DESCRIPTION = "Mandatory, xml:id identifier " - + "must be unique within the package."; + + "must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP94". @@ -3933,7 +3918,7 @@ private ConstantsCSIPspec() { */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP96_DESCRIPTION = "All file groups containing " + "documentation described in the package are " + "referenced via the relevant file group identifiers. " - + "There MUST be one file group reference per element."; + + "There SHOULD be one file group reference per element."; /** * Constant specification cardinality for id "CSIP96". @@ -3943,7 +3928,7 @@ private ConstantsCSIPspec() { /** * Constant specification level for id "CSIP96". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP96_LEVEL = "MUST"; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP96_LEVEL = "SHOULD"; /* CSIP116 */ @@ -4037,7 +4022,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP98". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP98_DESCRIPTION = "Mandatory, xml:id identifier " - + "must be unique within the package."; + + "must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP98". @@ -4116,7 +4101,7 @@ private ConstantsCSIPspec() { /** * Constant specification level for id "CSIP100". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP100_LEVEL = "MUST"; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP100_LEVEL = "SHOULD"; /* CSIP118 */ @@ -4211,7 +4196,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP102". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP102_DESCRIPTION = "Mandatory, xml:id " - + "identifier must be unique within the package."; + + "identifier must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP102". @@ -4290,7 +4275,7 @@ private ConstantsCSIPspec() { /** * Constant specification level for id "CSIP104". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP104_LEVEL = "MUST"; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP104_LEVEL = "SHOULD"; /* CSIP119 */ @@ -4385,7 +4370,7 @@ private ConstantsCSIPspec() { * Constant specification description for id "CSIP106". */ public static final String VALIDATION_REPORT_SPECIFICATION_CSIP106_DESCRIPTION = "Mandatory, xml:id " - + "identifier must be unique within the package."; + + "identifier must be unique within the XML-document."; /** * Constant specification cardinality for id "CSIP106". @@ -4418,10 +4403,12 @@ private ConstantsCSIPspec() { /** * Constant specification description for id "CSIP107". */ - public static final String VALIDATION_REPORT_SPECIFICATION_CSIP107_DESCRIPTION = "The package’s representation " - + "division
element @LABEL attribute value must be " + "the path to the representation level METS document. " - + "This requirement gives the same value to be used as the requirement " - + "named “File group identifier” (CSIP64) "; + public static final String VALIDATION_REPORT_SPECIFICATION_CSIP107_DESCRIPTION = "The package’s representation " + + "division
element @LABEL attribute value must be the path to the " + + "representation level METS document starting with the value “Representations” " + + "followed by the main folder name for example “Representations/submission” and “Representations/ingest”.\n" + + "This requirement gives the same value to be used as the requirement " + + "named “Description of the use of the file group” (CSIP64)"; /** * Constant specification cardinality for id "CSIP107". @@ -4934,9 +4921,6 @@ public static String getSpecificationName(final String id) { if (VALIDATION_REPORT_SPECIFICATION_CSIP85_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP85_NAME; } - if (VALIDATION_REPORT_SPECIFICATION_CSIP86_ID.equals(id)) { - return VALIDATION_REPORT_SPECIFICATION_CSIP86_NAME; - } if (VALIDATION_REPORT_SPECIFICATION_CSIP88_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP88_NAME; } @@ -5347,9 +5331,6 @@ public static String getSpecificationLocation(final String id) { if (VALIDATION_REPORT_SPECIFICATION_CSIP85_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP85_LOCATION; } - if (VALIDATION_REPORT_SPECIFICATION_CSIP86_ID.equals(id)) { - return VALIDATION_REPORT_SPECIFICATION_CSIP86_LOCATION; - } if (VALIDATION_REPORT_SPECIFICATION_CSIP88_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP88_LOCATION; } @@ -5760,9 +5741,6 @@ public static String getSpecificationDescription(final String id) { if (VALIDATION_REPORT_SPECIFICATION_CSIP85_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP85_DESCRIPTION; } - if (VALIDATION_REPORT_SPECIFICATION_CSIP86_ID.equals(id)) { - return VALIDATION_REPORT_SPECIFICATION_CSIP86_DESCRIPTION; - } if (VALIDATION_REPORT_SPECIFICATION_CSIP88_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP88_DESCRIPTION; } @@ -6173,9 +6151,6 @@ public static String getSpecificationCardinality(final String id) { if (VALIDATION_REPORT_SPECIFICATION_CSIP85_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP85_CARDINALITY; } - if (VALIDATION_REPORT_SPECIFICATION_CSIP86_ID.equals(id)) { - return VALIDATION_REPORT_SPECIFICATION_CSIP86_CARDINALITY; - } if (VALIDATION_REPORT_SPECIFICATION_CSIP88_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP88_CARDINALITY; } @@ -6586,9 +6561,6 @@ public static String getSpecificationLevel(final String id) { if (VALIDATION_REPORT_SPECIFICATION_CSIP85_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP85_LEVEL; } - if (VALIDATION_REPORT_SPECIFICATION_CSIP86_ID.equals(id)) { - return VALIDATION_REPORT_SPECIFICATION_CSIP86_LEVEL; - } if (VALIDATION_REPORT_SPECIFICATION_CSIP88_ID.equals(id)) { return VALIDATION_REPORT_SPECIFICATION_CSIP88_LEVEL; } diff --git a/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsSIPspec.java b/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsSIPspec.java index 5d75b492..09fc4041 100644 --- a/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsSIPspec.java +++ b/src/main/java/org/roda_project/commons_ip2/validator/constants/ConstantsSIPspec.java @@ -61,7 +61,7 @@ private ConstantsSIPspec() { * Constant specification description for id "SIP2". */ public static final String VALIDATION_REPORT_SPECIFICATION_SIP2_DESCRIPTION = "The value is set to " - + "“https://earksip.dilcis.eu/profile/E-ARK-SIP.xml”."; + + "“https://earksip.dilcis.eu/profile/E-ARK-SIP-v2-2-0.xml”."; /** * Constant specification cardinality for id "SIP2". @@ -244,7 +244,7 @@ private ConstantsSIPspec() { /** * Constant specification cardinality for id "SIP7". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP7_CARDINALITY = "1..1"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP7_CARDINALITY = "0..1"; /** * Constant specification level for id "SIP7". @@ -416,12 +416,12 @@ private ConstantsSIPspec() { /** * Constant specification cardinality for id "SIP12". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP12_CARDINALITY = "0..*"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP12_CARDINALITY = "1..1"; /** * Constant specification level for id "SIP12". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP12_LEVEL = "MAY"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP12_LEVEL = "MUST"; /* SIP13 */ @@ -510,8 +510,8 @@ private ConstantsSIPspec() { /** * Constant specification description for id "SIP15". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP15_DESCRIPTION = "The name of the " - + "organisation or person" + " submitting the package to the archive"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP15_DESCRIPTION = "A wrapper element that enables to " + + "encode the name of the organisation or person submitting the package to the archive."; /** * Constant specification cardinality for id "SIP15". @@ -619,7 +619,7 @@ private ConstantsSIPspec() { /** * Constant specification level for id "SIP18". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP18_LEVEL = "MAY"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP18_LEVEL = "MUST"; /* SIP19 */ @@ -641,8 +641,8 @@ private ConstantsSIPspec() { /** * Constant specification description for id "SIP19". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP19_DESCRIPTION = "The submitting agent " - + "has a note providing a " + "unique identification code for the archival creator."; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP19_DESCRIPTION = "The submitting agent has a note " + + "providing a unique identification code for the submitter."; /** * Constant specification cardinality for id "SIP19". @@ -707,7 +707,8 @@ private ConstantsSIPspec() { /** * Constant specification description for id "SIP21". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP21_DESCRIPTION = "Contact person for the submission."; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP21_DESCRIPTION = "A wrapper element that enables " + + "to encode the name of the contact person for the submission."; /** * Constant specification cardinality for id "SIP21". @@ -869,8 +870,8 @@ private ConstantsSIPspec() { /** * Constant specification description for id "SIP26". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP26_DESCRIPTION = "The organisation or person " - + "that preserves the package"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP26_DESCRIPTION = "A wrapper element that enables to" + + " encode the name of the organisation or person that preserves the package."; /** * Constant specification cardinality for id "SIP26". @@ -979,7 +980,7 @@ private ConstantsSIPspec() { /** * Constant specification level for id "SIP29". */ - public static final String VALIDATION_REPORT_SPECIFICATION_SIP29_LEVEL = "MAY"; + public static final String VALIDATION_REPORT_SPECIFICATION_SIP29_LEVEL = "MUST"; /* SIP30 */ /**