Add bfdb link (#80)

* fixes for table reload on save * display fixes * fix orphan problem * fix for load error * removing hardcoded server; add to env
lcnetdev · Apr 1, 2019 · b1a1210 · b1a1210
1 parent 70b52ca
commit b1a1210
Show file tree

Hide file tree

Showing 7 changed files with 412 additions and 327 deletions.
diff --git a/env.sh b/env.sh
@@ -1,3 +1,4 @@
 echo "env = {"
-echo "  RECTOBASE: '$RECTOBASE'"
+echo "  RECTOBASE: '$RECTOBASE',"
+echo "  BASEDBURI: '$BASEDBURI'"
 echo "}"
diff --git a/src/bfe.js b/src/bfe.js
diff --git a/src/bfeapi.js b/src/bfeapi.js
@@ -85,14 +85,12 @@ exports.save = function (data, bfelog, callback){
     $messagediv.insertBefore('.nav-tabs');
   }).always(function(){                       
     // $('#table_id').DataTable().ajax.reload();
-    exports.loadBrowseData()
   });
 }
 
 exports.publish = function (data, rdfxml, savename, bfelog, callback){
     var $messagediv = $('<div>', {id: "bfeditor-messagediv", class:"col-md-10 main"});
 
-    //var url = "http://mlvlp04.loc.gov:8201/bibrecs/bfe2mets.xqy";
     var url = config.url + "/profile-edit/server/publish";
     var saveurl = "/verso/api/bfs/upsertWithWhere?where=%7B%22name%22%3A%20%22"+savename+"%22%7D";
 
@@ -141,7 +139,6 @@ exports.publish = function (data, rdfxml, savename, bfelog, callback){
         $messagediv.insertBefore('#bfeditor-previewPanel');
       }).always(function(){
         // $('#table_id').DataTable().ajax.reload();
-        exports.loadBrowseData()
       });
   }
 

diff --git a/src/bfelookups.js b/src/bfelookups.js
@@ -119,7 +119,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
           subjecturi hasAuthority selected.uri
           subjecturi  bf:label selected.value
       */
-    exports.getResource = lcshared.getResourceWithAAP;
+    exports.getResource = lcshared.getResource;
   });
   bfe.define('src/lookups/lcshared', ['require', 'exports', 'src/bfelogging'], function (require, exports) {
     // require('https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.js');
@@ -151,27 +151,6 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
       return process(triples, property);
     };
 
-    exports.getResourceWithAAP = function (subjecturi, property, selected, process) {
-      var triples = [];
-
-      var triple = {};
-      triple.s = subjecturi;
-      triple.p = property.propertyURI;
-      triple.o = selected.uri;
-      triple.otype = 'uri';
-      triples.push(triple);
-
-      triple = {};
-      triple.s = subjecturi;
-      triple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
-      triple.o = selected.value;
-      triple.otype = 'literal';
-      triple.olang = 'en';
-      triples.push(triple);
-
-      process(triples, property);
-    };
-
     exports.getResourceLabelLookup = function (subjecturi, propertyuri, selected, process) {
       var triples = [];
 
@@ -640,7 +619,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
           subjecturi hasAuthority selected.uri
           subjecturi  bf:label selected.value
       */
-    exports.getResource = lcshared.getResourceWithAAP;
+    exports.getResource = lcshared.getResource;
   });
   bfe.define('src/lookups/lcgenreforms', ['require', 'exports', 'src/lookups/lcshared', 'src/bfelogging'], function (require, exports) {
     var lcshared = require('src/lookups/lcshared');
@@ -716,7 +695,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
       }, 300); // 300 ms
     };
 
-    exports.getResource = lcshared.getResourceWithAAP;
+    exports.getResource = lcshared.getResource;
   });
 
   bfe.define('src/lookups/rdaformatnotemus', ['require', 'exports', 'src/lookups/lcshared', 'src/bfelogging'], function (require, exports) {
@@ -1124,7 +1103,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
       return lcshared.simpleQuery(query, cache, exports.scheme, processSync, processAsync);
     };
 
-    exports.getResource = lcshared.getResourceWithAAP;
+    exports.getResource = lcshared.getResource;
   });
 
   bfe.define('src/lookups/relators', ['require', 'exports', 'src/lookups/lcshared', 'src/bfelogging'], function (require, exports) {

diff --git a/src/bfestore.js b/src/bfestore.js
@@ -54,27 +54,27 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     // add name, id triples
     var mintedId = 'e' + window.ShortUUID('0123456789').fromUUID(bfeditor.bfestore.name);
     var mintedUri = config.url + '/resources/' + mintedId;
-    var useguid = guid();
-    var bnode = '_:bnode' + useguid;
+
+    var bnode = '_:bnode' +  shortUUID(guid());
 
     var adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = resourceURI;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/adminMetadata';
     adminTriple.o = bnode;
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/AdminMetadata';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/creationDate';
     var d = new Date(bfeditor.bfestore.created);
@@ -83,113 +83,119 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionAuthentication';
     adminTriple.o = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionAuthentication';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
+    adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
+    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
+    adminTriple.o = 'pcc';
+    adminTriple.otype = 'literal';
+    bfeditor.bfestore.store.push(adminTriple);
+
+    adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionConventions';
     adminTriple.o = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionConventions';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
+    adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
+    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
+    adminTriple.o = 'RDA';
+    adminTriple.otype = 'literal';
+    bfeditor.bfestore.store.push(adminTriple);
+
+    adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionLanguage';
     adminTriple.o = 'http://id.loc.gov/vocabulary/languages/eng';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/Language';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
+    adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
+    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
+    adminTriple.o = 'English';
+    adminTriple.otype = 'literal';
+    bfeditor.bfestore.store.push(adminTriple);
+
+    adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionModifier';
     adminTriple.o = 'http://id.loc.gov/vocabulary/organizations/dlc';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = 'http://id.loc.gov/vocabulary/organizations/dlc';
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionModifier';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
-    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
-    adminTriple.o = 'pcc';
-    adminTriple.otype = 'Literal';
-    bfeditor.bfestore.store.push(adminTriple);
-
-    adminTriple = {};
-    adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
-    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
-    adminTriple.o = 'RDA';
-    adminTriple.otype = 'literal';
-    bfeditor.bfestore.store.push(adminTriple);
-
-    adminTriple = {};
-    adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
-    adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
-    adminTriple.o = 'English';
-    adminTriple.otype = 'literal';
-    bfeditor.bfestore.store.push(adminTriple);
-
-    adminTriple = {};
+    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.otype = 'literal';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
-    adminTriple.guid = useguid;
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = bnode;
     adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/identifiedBy';
     adminTriple.o = mintedUri;
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = mintedUri;
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
     adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/Local';
     adminTriple.otype = 'uri';
     bfeditor.bfestore.store.push(adminTriple);
 
     adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = mintedUri;
     adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#value';
     adminTriple.o = mintedId;
@@ -206,6 +212,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     bfeditor.bfestore.store = _.without(bfeditor.bfestore.store, _.findWhere(bfeditor.bfestore.store, { s: resourceURI, p: 'http://id.loc.gov/ontologies/bflc/procInfo' }));
 
     var adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = resourceURI;
     adminTriple.p = 'http://id.loc.gov/ontologies/bflc/procInfo';
     adminTriple.o = procInfo;
@@ -215,13 +222,22 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
 
   exports.addProfile = function (resourceURI, profile) {
     var adminTriple = {};
+    adminTriple.guid = shortUUID(guid());
     adminTriple.s = resourceURI;
     adminTriple.p = 'http://id.loc.gov/ontologies/bflc/profile';
     adminTriple.o = profile;
     adminTriple.otype = 'literal';
     bfeditor.bfestore.store.push(adminTriple);
   }
 
+  exports.removeOrphans = function (defaultURI) {
+    _.forEach(exports.store, function(t) {
+      if(!_.some(exports.store, {o:t.s}) && t.s !== defaultURI ){
+        exports.store = _.without(exports.store, t);
+      }
+    })
+  }
+
   exports.storeDedup = function () {
     exports.store = _.uniq(exports.store, function (t) {
       if (t.olang !== undefined) {
@@ -310,7 +326,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
 
   exports.jsonld2store = function (jsonld) {
     jsonld.forEach(function (resource) {
-      var s = typeof resource['@id'] !== 'undefined' ? resource['@id'] : '_:b' + guid();
+      var s = typeof resource['@id'] !== 'undefined' ? resource['@id'] : '_:b' + shortUUID(guid());
       for (var p in resource) {
         if (p !== '@id') {
           if (p === 'http://www.loc.gov/mads/rdf/v1#componentList'){
@@ -325,7 +341,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
             }
 
             list.forEach(function (l) {
-              var tguid = guid();
+              var tguid = shortUUID(guid());
               var triple = {};
               triple.guid = tguid;
               triple.s = s;
@@ -336,7 +352,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
             });
 
           } else if (p === '@type' && !_.isArray(resource[p])) {
-            var tguid = guid();
+            var tguid = shortUUID(guid());
             var triple = {};
             triple.guid = tguid;
             triple.s = s;
@@ -346,7 +362,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
             exports.store.push(triple);
           } else {
             resource[p].forEach(function (o) {
-              var tguid = guid();
+              var tguid = shortUUID(guid());
               var triple = {};
               triple.guid = tguid;
               if (p === '@type') {
@@ -593,4 +609,9 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
     return translator.uuid();
   }
 
+  function shortUUID(uuid) {
+    var translator = window.ShortUUID();
+    return translator.fromUUID(uuid);
+  }
+
 });