Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Made corrections to assembly and WARC standard infomation #27

Open
wants to merge 1 commit into
base: wip
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/assembly/release.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
<fileSet>
<directory>${project.basedir}/src/main/resources/scripts/xsd</directory>
<lineEnding>lf</lineEnding>
<outputDirectory>${file.separator}script${file.separator}xsd${file.separator}</outputDirectory>
<outputDirectory>${file.separator}scripts${file.separator}xsd${file.separator}</outputDirectory>
<fileMode>0744</fileMode>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources/scripts/xslt</directory>
<lineEnding>lf</lineEnding>
<outputDirectory>${file.separator}script${file.separator}xslt${file.separator}</outputDirectory>
<outputDirectory>${file.separator}scripts${file.separator}xslt${file.separator}</outputDirectory>
<fileMode>0744</fileMode>
<filtered>true</filtered>
</fileSet>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
public class WarcInfoConstants {
/** The header value for WARC info records.*/
protected static final String INFO_RECORD_HEADER =
"description: http://id.kb.dk/authorities/agents/kbDkCumulusBevaringsService.html\n"
"description: http://id.kb.dk/authorities/agents/kbDkCumulusBevaringsService.xml\n"
+ "version: " + AgentSelector.getApiAgentValue() + "\n"
+ "conformsTo: http://bibnum.bnf.fr/WARC/WARC_ISO_28500_version1_latestdraft.pdf\n"
+ "revision: 1.0.0\n";
+ "conformsTo: ISO 28500\n"
+ "version: 1.0\n";

/** The list of preservable system properties for the WarcInfo.*/
public static final Collection<String> SYSTEM_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class FullValidationStepTest extends ExtendedTestCase {

String warcPath = "src/test/resources/warc/warcexample.warc";
String warcRecordId = "random-file-uuid";
String warcFileChecksum = "5cbce357d343f30f2c215dcf1ee94c66";
String warcFileChecksum = "dc3c3c8e28f29cb14e32adf02e0eb1be";
String warcRecordChecksum = "a2919627d81e5e53bf9e2bce13fa44ae";
Long warcRecordSize = 36L;

Expand Down
9 changes: 5 additions & 4 deletions src/test/resources/warc/warcexample.warc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ WARC/1.0
WARC-Type: warcinfo
WARC-Record-ID: <urn:uuid:fe271a89-6b19-4983-816f-90e23f137762>
WARC-Date: 2015-07-22T11:21:30Z
Content-Length: 166
Content-Length: 121
Content-Type: application/warc-fields
WARC-Block-Digest: sha-1:c3bd826d9113efb6c1351eff4f5e3ef4a7bb3381
WARC-Filename: fe271a89-6b19-4983-816f-90e23f137762

description: http://id.kb.dk/authorities/agents/kbDkYggdrasilIngest.xml
revision: 1.0.0
conformsTo: http://bibnum.bnf.fr/WARC/WARC_ISO_28500_version1_latestdraft.pdf
description: http://id.kb.dk/authorities/agents/kbDkYggdrasilIngest.xml
version: 1.0.0
conformsTo: ISO 28500
version 1.0


WARC/1.0
Expand Down