Skip to content

Commit 14da7fe

Browse files
committed
Fix bug in checksumming files
Closes #17
1 parent 86fecc5 commit 14da7fe

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

R/editing.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ publish_object <- function(mn,
5858
identifier = pid,
5959
formatId = format_id,
6060
size = file.size(path),
61-
checksum = digest::digest(path, algo="sha256"),
62-
checksumAlgorithm = "SHA256",
61+
checksum = digest::digest(path, algo = "sha1", serialize = FALSE, file = TRUE),
62+
checksumAlgorithm = "SHA1",
6363
submitter = me,
6464
rightsHolder = me,
6565
fileName = basename(path))
@@ -131,8 +131,8 @@ update_object <- function(mn, pid, path, format_id=NULL) {
131131
sysmeta@identifier <- new_pid
132132
sysmeta@formatId <- format_id
133133
sysmeta@size <- file.size(path)
134-
sysmeta@checksum <- digest::digest(path, algo = "sha256")
135-
sysmeta@checksumAlgorithm <- "SHA256"
134+
sysmeta@checksum <- digest::digest(path, algo = "sha1", serialize = FALSE, file = TRUE)
135+
sysmeta@checksumAlgorithm <- "SHA1"
136136
slot(sysmeta, "obsoletes", check = FALSE) <- NA
137137
slot(sysmeta, "obsoletedBy", check = FALSE) <- NA
138138
sysmeta@fileName <- basename(path)
@@ -327,8 +327,8 @@ publish_update <- function(mn,
327327
identifier = metadata_updated_pid,
328328
formatId = "eml://ecoinformatics.org/eml-2.1.1",
329329
size = file.size(eml_path),
330-
checksum = digest::digest(eml_path, algo = "sha256"),
331-
checksumAlgorithm = "SHA256",
330+
checksum = digest::digest(eml_path, algo = "sha1", serialize = FALSE, file = TRUE),
331+
checksumAlgorithm = "SHA1",
332332
submitter = me,
333333
rightsHolder = metadata_sysmeta@rightsHolder,
334334
obsoletes = metadata_pid,
@@ -563,8 +563,8 @@ update_resource_map <- function(mn,
563563
new_rm_sysmeta <- sysmeta
564564
new_rm_sysmeta@identifier <- identifier
565565
new_rm_sysmeta@size <- file.size(new_rm_path)
566-
new_rm_sysmeta@checksum <- digest::digest(new_rm_path, algo = "sha256")
567-
new_rm_sysmeta@checksumAlgorithm <- "SHA256"
566+
new_rm_sysmeta@checksum <- digest::digest(new_rm_path, algo = "sha1", serialize = FALSE, file = TRUE)
567+
new_rm_sysmeta@checksumAlgorithm <- "SHA1"
568568
new_rm_sysmeta@rightsHolder <- previous_rights_holder
569569
new_rm_sysmeta@obsoletes <- resource_map_pid
570570
slot(new_rm_sysmeta, "obsoletedBy", check = FALSE) <- NA

R/helpers.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ create_dummy_metadata <- function(mn, data_pids=NULL) {
2828
id = pid,
2929
formatId = "eml://ecoinformatics.org/eml-2.1.1",
3030
size = file.size(metadata_file),
31-
checksum = digest::digest(metadata_file, algo = "sha256"),
32-
checksumAlgorithm = "SHA256",
31+
checksum = digest::digest(metadata_file, algo = "sha1", serialize = FALSE, file = TRUE),
32+
checksumAlgorithm = "SHA1",
3333
submitter = me,
3434
rightsHolder = me,
3535
fileName = "dummy_science_metadata.xml")
@@ -65,8 +65,8 @@ create_dummy_object <- function(mn) {
6565
id = pid,
6666
formatId = "application/octet-stream",
6767
size = file.size(tmp),
68-
checksum = digest::digest(tmp, algo = "sha256"),
69-
checksumAlgorithm = "SHA256",
68+
checksum = digest::digest(tmp, algo = "sha1", serialize = FALSE, file = TRUE),
69+
checksumAlgorithm = "SHA1",
7070
submitter = me,
7171
rightsHolder = me,
7272
fileName = "dummy_object")
@@ -118,8 +118,8 @@ create_dummy_package <- function(mn, size = 2) {
118118
identifier = pid,
119119
formatId = "http://www.openarchives.org/ore/terms",
120120
size = file.size(resmap_path),
121-
checksum = digest::digest(resmap_path, algo = "sha256"),
122-
checksumAlgorithm = "SHA256",
121+
checksum = digest::digest(resmap_path, algo = "sha1", serialize = FALSE, file = TRUE),
122+
checksumAlgorithm = "SHA1",
123123
submitter = me,
124124
rightsHolder = me,
125125
fileName = "dummy_resource_map.xml")
@@ -158,8 +158,8 @@ create_dummy_parent_package <- function(mn, children) {
158158
identifier = pid,
159159
formatId = "http://www.openarchives.org/ore/terms",
160160
size = file.size(resmap_path),
161-
checksum = digest::digest(resmap_path, algo = "sha256"),
162-
checksumAlgorithm = "SHA256",
161+
checksum = digest::digest(resmap_path, algo = "sha1", serialize = FALSE, file = TRUE),
162+
checksumAlgorithm = "SHA1",
163163
submitter = me,
164164
rightsHolder = me,
165165
fileName = "dummy_resource_map.xml")

0 commit comments

Comments
 (0)