Picked up a bug in the licenses part of catalog.json

datacrate.js

@@ -18,22 +18,22 @@ const APPROVER = 'Sharyn.Wise@uts.edu.au';
 
 
 
-async function makedatacrate(dest, datapub) {
+async function makedatacrate(doi, datapub, dest) {
 	await fs.ensureDir(dest);
 	const catalog = await datacrate.datapub2catalog({
-		id: id,
+		id: doi,
 		datapub: datapub,
 		organisation: ORGANISATION,
 		owner: OWNER,
 		approver: APPROVER
 	});
-	const catfile = path.join(dest, id, 'CATALOG.json');
+	const catfile = path.join(dest, 'CATALOG.json');
 	await fs.writeFile(catfile, JSON.stringify(catalog, null, 2));
 }
 
-async function convertdatapub(jsonfile, dest) {
+async function convertdatapub(pid, jsonfile, dest) {
 	const datapub = await fs.readJSON(jsonfile);
-	await makedatacrate(dest, datapub);
+	await makedatacrate(pid, datapub, dest);
 }
 
 
@@ -47,9 +47,18 @@ var parser = new ArgumentParser({
 parser.addArgument(
 	['-i', '--input'],
 	{
-		help: "The input data publication"
+		help: "The input data publication",
+		required: true
 	});
 
+parser.addArgument(
+	['-p', '--persistentid'],
+	{
+		help: "The persistent ID for the datacrate (a DOI, say)",
+		required: true
+	});
+
+
 parser.addArgument(
 	['-d', '--directory'],
 	{
@@ -62,5 +71,5 @@ parser.addArgument(
 
 var args = parser.parseArgs();
 
-convertdatapub(args['input'], args['directory']);
+convertdatapub(args['persistentid'], args['input'], args['directory']);
 

lib/catalog.js

@@ -535,7 +535,7 @@ function make_temporal(datapub) {
 
 
 function make_license(datapub, prefix) {
-	const license = [];
+	const licenses = [];
 	if( datapub['license_other_url'] || datapub['license_notes'] ) {
 		if( datapub['license_other_url'] ) {
 			licenses.push({