Merge branch 'master' of github.com:lcnetdev/bfe

lcnetdev · May 24, 2019 · 29ef9a4 · 29ef9a4
2 parents 36b64fe + 1e937ef
commit 29ef9a4
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 201 deletions.
diff --git a/src/bfe.js b/src/bfe.js
diff --git a/src/bfeapi.js b/src/bfeapi.js
@@ -125,7 +125,8 @@ exports.publish = function (data, rdfxml, savename, bfelog, callback){
         document.body.scrollTop = document.documentElement.scrollTop = 0;
         bfelog.addMsg(new Error(), "INFO", "Published " + publishdata[0].name);
         var $messagediv = $('<div>', {id: "bfeditor-messagediv",class: 'alert alert-info' });
-        $messagediv.append('<strong>Description submitted for posting:</strong><a href=' + config.basedbURI + "/" + publishdata[0].objid+'>'+publishdata[0].lccn+'</a>');
+        var displayText = publishdata[0].lccn !== undefined ? publishdata[0].lccn : publishdata[0].objid;
+        $messagediv.append('<strong>Description submitted for posting:</strong><a href=' + config.basedbURI + "/" + publishdata[0].objid+'>'+displayText+'</a>');
         $('#bfeditor-formdiv').empty();
         $('#save-btn').remove();
         $messagediv.insertBefore('.nav-tabs');

diff --git a/src/bfestore.js b/src/bfestore.js
@@ -88,7 +88,15 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/creationDate';
     var d = new Date(bfeditor.bfestore.created);
-    adminTriple.o = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
+    adminTriple.o = d.getFullYear() + '-' + ('0' + (d.getMonth() + 1)).slice(-2) + '-' + ('0' + d.getDate()).slice(-2);
+    adminTriple.otype = 'literal';
+    bfeditor.bfestore.store.push(adminTriple);
+
+    adminTriple = {};
+    adminTriple.s = bnode;
+    adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/changeDate';
+    var modifiedDate = new Date().toUTCString();
+    adminTriple.o = new Date(modifiedDate).toJSON().split(/\./)[0];
     adminTriple.otype = 'literal';
     bfeditor.bfestore.store.push(adminTriple);
 
@@ -184,7 +192,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     adminTriple.guid = shortUUID(guid());
     adminTriple.s = 'http://id.loc.gov/vocabulary/organizations/dlc';
     adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
-    adminTriple.o = 'DLC';
+    adminTriple.o = 'dlc';
     adminTriple.otype = 'literal';
     bfeditor.bfestore.store.push(adminTriple);
 
@@ -265,53 +273,51 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     return exports.store;
   };
 
-  exports.store2rdfxml = function (jsonld, callback) {
-    exports.store2jsonldnormalized(jsonld, function (expanded) {
-      jsonld.toRDF(expanded, {
-        format: 'application/nquads'
-      }, function (err, nquads) {
-        //json2turtle(nquads, callback);
-        var parser = N3.Parser();
-        var turtlestore = N3.Store();
-        parser.parse(nquads, function (error, triple, theprefixes) {
-          if (triple) {
-            turtlestore.addTriple(triple);
-          } else {
-            turtlestore.addPrefixes(theprefixes);
-            var turtleWriter = N3.Writer({
-              prefixes: {
-                bf: 'http://id.loc.gov/ontologies/bibframe/',
-                bflc: 'http://id.loc.gov/ontologies/bflc/',
-                madsrdf: "http://www.loc.gov/mads/rdf/v1#",
-                pmo: 'http://performedmusicontology.org/ontology/',
-                rdf: "http://www.w3.org/1999/02/22-rdf-sydntax-ns#",
-                rdfs: "http://www.w3.org/2000/01/rdf-schema#",
-                xsd: "http://www.w3.org/2001/XMLSchema#",
-                datatypes: "http://id.loc.gov/datatypes/",
-                lclocal: "http://id.loc.gov/ontologies/lclocal/"
+  exports.store2rdfxml = function (expanded, callback) {
+    jsonld.toRDF(expanded, {
+      format: 'application/nquads'
+    }, function (err, nquads) {
+      //json2turtle(nquads, callback);
+      var parser = N3.Parser();
+      var turtlestore = N3.Store();
+      parser.parse(nquads, function (error, triple, theprefixes) {
+        if (triple) {
+          turtlestore.addTriple(triple);
+        } else {
+          turtlestore.addPrefixes(theprefixes);
+          var turtleWriter = N3.Writer({
+            prefixes: {
+              bf: 'http://id.loc.gov/ontologies/bibframe/',
+              bflc: 'http://id.loc.gov/ontologies/bflc/',
+              madsrdf: "http://www.loc.gov/mads/rdf/v1#",
+              pmo: 'http://performedmusicontology.org/ontology/',
+              rdf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+              rdfs: "http://www.w3.org/2000/01/rdf-schema#",
+              xsd: "http://www.w3.org/2001/XMLSchema#",
+              datatypes: "http://id.loc.gov/datatypes/",
+              lclocal: "http://id.loc.gov/ontologies/lclocal/"
+            }
+          });
+          turtleWriter.addTriples(turtlestore.getTriples(null, null, null));
+          turtleWriter.end(function (error, result) {
+            var input = {};
+            input.n3 = result;
+            $.ajax({
+              url: config.url + "/profile-edit/server/n3/rdfxml",
+              type: "POST",
+              data: JSON.stringify(input),
+              processData: false,
+              contentType: "application/json",
+              success: function (rdfxml) {
+                var data = new XMLSerializer().serializeToString(rdfxml);
+                callback(data);
+              },
+              error: function (XMLHttpRequest, status, err) {
+                bfeditor.bfelog.addMsg(new Error(), 'ERROR', err);
               }
             });
-            turtleWriter.addTriples(turtlestore.getTriples(null, null, null));
-            turtleWriter.end(function (error, result) {
-              var input = {};
-              input.n3 = result;
-              $.ajax({
-                url: config.url + "/profile-edit/server/n3/rdfxml",
-                type: "POST",
-                data: JSON.stringify(input),
-                processData: false,
-                contentType: "application/json",
-                success: function (rdfxml) {
-                  var data = new XMLSerializer().serializeToString(rdfxml);
-                  $("#rdfxml .panel-body pre").text(data);
-                },
-                error: function (XMLHttpRequest, status, err) {
-                  bfeditor.bfelog.addMsg(new Error(), 'ERROR', err);
-                }
-              });
-            });
-          }
-        });
+          });
+        }
       });
     });
     callback;

diff --git a/static/js/config-dev.js b/static/js/config-dev.js
@@ -55,7 +55,7 @@ var config = {
     "basedbURI": baseDBURI,
     "resourceURI": resourceURI,
     "buildContext": buildcontext,
-    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
+    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','http://id.loc.gov/authorities/childrensSubjects','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
     "buildContextForWorksEndpoint": workContext,
     "enableUserTemplates" :enableusertemplates,
     "enableLoadMarc": loadmarc,

diff --git a/static/js/config-test.js b/static/js/config-test.js
@@ -59,7 +59,7 @@ var config = {
     "basedbURI": baseDBURI,
     "resourceURI": resourceURI,
     "buildContext": buildcontext,
-    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
+    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','http://id.loc.gov/authorities/childrensSubjects','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
     "buildContextForWorksEndpoint": workContext,
     "enableUserTemplates" :enableusertemplates,
     "enableLoadMarc": loadmarc,

diff --git a/static/js/config.js b/static/js/config.js
@@ -55,7 +55,7 @@ var config = {
     "basedbURI": baseDBURI,
     "resourceURI": resourceURI,
     "buildContext": buildcontext,
-    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
+    "buildContextFor": ['id.loc.gov/authorities/names/','id.loc.gov/authorities/subjects/','http://id.loc.gov/authorities/childrensSubjects','id.loc.gov/vocabulary/relators/','id.loc.gov/resources/works/', 'id.loc.gov/bfentities/providers/','id.loc.gov/entities/providers/','id.loc.gov/authorities/genreForms'],
     "buildContextForWorksEndpoint": workContext,
     "enableUserTemplates" :enableusertemplates,
     "enableLoadMarc": loadmarc,