diff --git a/src/Metadata.js b/src/Metadata.js index 8ae72cd..c11e4a4 100644 --- a/src/Metadata.js +++ b/src/Metadata.js @@ -8,7 +8,7 @@ class ManifestMetadata { date = ''; imageAuthor = ''; license = 'CC BY-NC-ND 4.0'; - copyright = 'BNN/CNR-ISPC'; + copyright = "Ministero della Cultura (Biblioteca Nazionale 'Vittorio Emanuele III' di Napoli)/CNR-Istituto di Scienze del Patrimonio Culturale"; /** * @todo Maybe this doesn't make any sense?? diff --git a/src/common.js b/src/common.js index 5f561de..3f7f8da 100644 --- a/src/common.js +++ b/src/common.js @@ -20,9 +20,8 @@ const authors = { DAN: 'Danilo P. Pavone', }; /** - * * @param {string} imgFilename - * @returns {object} + * @returns {{papyrus:string,imageAuthor:string,date:string}} */ function extractNIRMetadata(imgFilename) { return { @@ -32,15 +31,27 @@ function extractNIRMetadata(imgFilename) { } } /** - * * @param {string} imgFilename - * @returns {object} + * @returns {{papyrus:string,imageAuthor:string,date:string,copyright:string}} */ -function extractDNOMetadata(imgFilename) { +function extractDNMetadata(imgFilename) { return { papyrus: imgFilename.split('_')[1], imageAuthor: '', date: '', + copyright: "Ministero della Cultura (Biblioteca Nazionale 'Vittorio Emanuele III' di Napoli)", + } +} +/** + * @param {string} imgFilename + * @returns {{papyrus:string,imageAuthor:string,date:string,copyright:string}} + */ +function extractDOMetadata(imgFilename) { + return { + papyrus: imgFilename.split('_')[1], + imageAuthor: '', + date: '', + copyright: "The Bodleian Libraries, University of Oxford", } } /** @@ -63,6 +74,7 @@ Common.getParamsFromFolders = async function() { } /** * @param {string} manifestId + * @returns {string[]} */ Common.getImageList = async function (manifestId) { let folderName = manifestId.replace(/pherc-(\d+)-(\w+)$/, function (_match, g1, g2) { @@ -105,6 +117,7 @@ Common.getImageSize = async function (imageId) { /** * Get image name for given canvas * @param {Canvas} canvas + * @returns {string} */ Common.getImageName = async function (canvas) { const images = await this.getImageList(canvas.resourceId); @@ -117,7 +130,7 @@ Common.getImageName = async function (canvas) { * Create a canvas from an image filename * @param {Manifest} manifest * @param {string} filename The image filename - * @returns + * @returns {Canvas} */ Common.createCanvas = async function (manifest, filename) { let canvas = new Canvas( @@ -199,12 +212,13 @@ Common.createMetadata = function (manifest, imgFilename) { /** * @param {string} imgFilename * @param {string} technique + * @returns {{papyrus:string,imageAuthor:string,date:string,copyright:?string}} */ Common.getMetadataFromImgName = function (imgFilename, technique) { const extractor = { nir: extractNIRMetadata, - dn: extractDNOMetadata, - do: extractDNOMetadata, + dn: extractDNMetadata, + do: extractDOMetadata, } return extractor[technique](imgFilename);