Skip to content

Commit b1a1210

Browse files
kirkhesskirkhess
authored
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
1 parent 70b52ca commit b1a1210

File tree

7 files changed

+412
-327
lines changed

7 files changed

+412
-327
lines changed

‎env.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
echo "env = {"
2-
echo " RECTOBASE: '$RECTOBASE'"
2+
echo " RECTOBASE: '$RECTOBASE',"
3+
echo " BASEDBURI: '$BASEDBURI'"
34
echo "}"

‎src/bfe.js‎

Lines changed: 280 additions & 211 deletions
Large diffs are not rendered by default.

‎src/bfeapi.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,12 @@ exports.save = function (data, bfelog, callback){
8585
$messagediv.insertBefore('.nav-tabs');
8686
}).always(function(){
8787
// $('#table_id').DataTable().ajax.reload();
88-
exports.loadBrowseData()
8988
});
9089
}
9190

9291
exports.publish = function (data, rdfxml, savename, bfelog, callback){
9392
var $messagediv = $('<div>', {id: "bfeditor-messagediv", class:"col-md-10 main"});
9493

95-
//var url = "http://mlvlp04.loc.gov:8201/bibrecs/bfe2mets.xqy";
9694
var url = config.url + "/profile-edit/server/publish";
9795
var saveurl = "/verso/api/bfs/upsertWithWhere?where=%7B%22name%22%3A%20%22"+savename+"%22%7D";
9896

@@ -141,7 +139,6 @@ exports.publish = function (data, rdfxml, savename, bfelog, callback){
141139
$messagediv.insertBefore('#bfeditor-previewPanel');
142140
}).always(function(){
143141
// $('#table_id').DataTable().ajax.reload();
144-
exports.loadBrowseData()
145142
});
146143
}
147144

‎src/bfelookups.js‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
119119
subjecturi hasAuthority selected.uri
120120
subjecturi bf:label selected.value
121121
*/
122-
exports.getResource = lcshared.getResourceWithAAP;
122+
exports.getResource = lcshared.getResource;
123123
});
124124
bfe.define('src/lookups/lcshared', ['require', 'exports', 'src/bfelogging'], function (require, exports) {
125125
// 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',
151151
return process(triples, property);
152152
};
153153

154-
exports.getResourceWithAAP = function (subjecturi, property, selected, process) {
155-
var triples = [];
156-
157-
var triple = {};
158-
triple.s = subjecturi;
159-
triple.p = property.propertyURI;
160-
triple.o = selected.uri;
161-
triple.otype = 'uri';
162-
triples.push(triple);
163-
164-
triple = {};
165-
triple.s = subjecturi;
166-
triple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
167-
triple.o = selected.value;
168-
triple.otype = 'literal';
169-
triple.olang = 'en';
170-
triples.push(triple);
171-
172-
process(triples, property);
173-
};
174-
175154
exports.getResourceLabelLookup = function (subjecturi, propertyuri, selected, process) {
176155
var triples = [];
177156

@@ -640,7 +619,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
640619
subjecturi hasAuthority selected.uri
641620
subjecturi bf:label selected.value
642621
*/
643-
exports.getResource = lcshared.getResourceWithAAP;
622+
exports.getResource = lcshared.getResource;
644623
});
645624
bfe.define('src/lookups/lcgenreforms', ['require', 'exports', 'src/lookups/lcshared', 'src/bfelogging'], function (require, exports) {
646625
var lcshared = require('src/lookups/lcshared');
@@ -716,7 +695,7 @@ bfe.define('src/lookups/lcnames', ['require', 'exports', 'src/lookups/lcshared',
716695
}, 300); // 300 ms
717696
};
718697

719-
exports.getResource = lcshared.getResourceWithAAP;
698+
exports.getResource = lcshared.getResource;
720699
});
721700

722701
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',
11241103
return lcshared.simpleQuery(query, cache, exports.scheme, processSync, processAsync);
11251104
};
11261105

1127-
exports.getResource = lcshared.getResourceWithAAP;
1106+
exports.getResource = lcshared.getResource;
11281107
});
11291108

11301109
bfe.define('src/lookups/relators', ['require', 'exports', 'src/lookups/lcshared', 'src/bfelogging'], function (require, exports) {

‎src/bfestore.js‎

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
5454
// add name, id triples
5555
var mintedId = 'e' + window.ShortUUID('0123456789').fromUUID(bfeditor.bfestore.name);
5656
var mintedUri = config.url + '/resources/' + mintedId;
57-
var useguid = guid();
58-
var bnode = '_:bnode' + useguid;
57+
58+
var bnode = '_:bnode' + shortUUID(guid());
5959

6060
var adminTriple = {};
61-
adminTriple.guid = useguid;
61+
adminTriple.guid = shortUUID(guid());
6262
adminTriple.s = resourceURI;
6363
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/adminMetadata';
6464
adminTriple.o = bnode;
6565
adminTriple.otype = 'uri';
6666
bfeditor.bfestore.store.push(adminTriple);
6767

6868
adminTriple = {};
69-
adminTriple.guid = useguid;
69+
adminTriple.guid = shortUUID(guid());
7070
adminTriple.s = bnode;
7171
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
7272
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/AdminMetadata';
7373
adminTriple.otype = 'uri';
7474
bfeditor.bfestore.store.push(adminTriple);
7575

7676
adminTriple = {};
77-
adminTriple.guid = useguid;
77+
adminTriple.guid = shortUUID(guid());
7878
adminTriple.s = bnode;
7979
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/creationDate';
8080
var d = new Date(bfeditor.bfestore.created);
@@ -83,113 +83,119 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
8383
bfeditor.bfestore.store.push(adminTriple);
8484

8585
adminTriple = {};
86-
adminTriple.guid = useguid;
86+
adminTriple.guid = shortUUID(guid());
8787
adminTriple.s = bnode;
8888
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionAuthentication';
8989
adminTriple.o = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
9090
adminTriple.otype = 'uri';
9191
bfeditor.bfestore.store.push(adminTriple);
9292

9393
adminTriple = {};
94-
adminTriple.guid = useguid;
94+
adminTriple.guid = shortUUID(guid());
9595
adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
9696
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
9797
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionAuthentication';
9898
adminTriple.otype = 'uri';
9999
bfeditor.bfestore.store.push(adminTriple);
100100

101101
adminTriple = {};
102-
adminTriple.guid = useguid;
102+
adminTriple.guid = shortUUID(guid());
103+
adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
104+
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
105+
adminTriple.o = 'pcc';
106+
adminTriple.otype = 'literal';
107+
bfeditor.bfestore.store.push(adminTriple);
108+
109+
adminTriple = {};
110+
adminTriple.guid = shortUUID(guid());
103111
adminTriple.s = bnode;
104112
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionConventions';
105113
adminTriple.o = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
106114
adminTriple.otype = 'uri';
107115
bfeditor.bfestore.store.push(adminTriple);
108116

109117
adminTriple = {};
110-
adminTriple.guid = useguid;
118+
adminTriple.guid = shortUUID(guid());
111119
adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
112120
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
113121
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionConventions';
114122
adminTriple.otype = 'uri';
115123
bfeditor.bfestore.store.push(adminTriple);
116124

117125
adminTriple = {};
118-
adminTriple.guid = useguid;
126+
adminTriple.guid = shortUUID(guid());
127+
adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
128+
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
129+
adminTriple.o = 'RDA';
130+
adminTriple.otype = 'literal';
131+
bfeditor.bfestore.store.push(adminTriple);
132+
133+
adminTriple = {};
134+
adminTriple.guid = shortUUID(guid());
119135
adminTriple.s = bnode;
120136
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionLanguage';
121137
adminTriple.o = 'http://id.loc.gov/vocabulary/languages/eng';
122138
adminTriple.otype = 'uri';
123139
bfeditor.bfestore.store.push(adminTriple);
124140

125141
adminTriple = {};
126-
adminTriple.guid = useguid;
142+
adminTriple.guid = shortUUID(guid());
127143
adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
128144
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
129145
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/Language';
130146
adminTriple.otype = 'uri';
131147
bfeditor.bfestore.store.push(adminTriple);
132148

133149
adminTriple = {};
134-
adminTriple.guid = useguid;
150+
adminTriple.guid = shortUUID(guid());
151+
adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
152+
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
153+
adminTriple.o = 'English';
154+
adminTriple.otype = 'literal';
155+
bfeditor.bfestore.store.push(adminTriple);
156+
157+
adminTriple = {};
158+
adminTriple.guid = shortUUID(guid());
135159
adminTriple.s = bnode;
136160
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/descriptionModifier';
137161
adminTriple.o = 'http://id.loc.gov/vocabulary/organizations/dlc';
138162
adminTriple.otype = 'uri';
139163
bfeditor.bfestore.store.push(adminTriple);
140164

141165
adminTriple = {};
142-
adminTriple.guid = useguid;
166+
adminTriple.guid = shortUUID(guid());
143167
adminTriple.s = 'http://id.loc.gov/vocabulary/organizations/dlc';
144168
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
145169
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/DescriptionModifier';
146170
adminTriple.otype = 'uri';
147171
bfeditor.bfestore.store.push(adminTriple);
148172

149173
adminTriple = {};
150-
adminTriple.s = 'http://id.loc.gov/vocabulary/marcauthen/pcc';
151-
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
152-
adminTriple.o = 'pcc';
153-
adminTriple.otype = 'Literal';
154-
bfeditor.bfestore.store.push(adminTriple);
155-
156-
adminTriple = {};
157-
adminTriple.s = 'http://id.loc.gov/vocabulary/descriptionConventions/rda';
158-
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
159-
adminTriple.o = 'RDA';
160-
adminTriple.otype = 'literal';
161-
bfeditor.bfestore.store.push(adminTriple);
162-
163-
adminTriple = {};
164-
adminTriple.s = 'http://id.loc.gov/vocabulary/languages/eng';
165-
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
166-
adminTriple.o = 'English';
167-
adminTriple.otype = 'literal';
168-
bfeditor.bfestore.store.push(adminTriple);
169-
170-
adminTriple = {};
174+
adminTriple.guid = shortUUID(guid());
171175
adminTriple.s = 'http://id.loc.gov/vocabulary/organizations/dlc';
172176
adminTriple.p = 'http://www.w3.org/2000/01/rdf-schema#label';
173177
adminTriple.o = 'DLC';
174178
adminTriple.otype = 'literal';
175179
bfeditor.bfestore.store.push(adminTriple);
176180

177181
adminTriple = {};
178-
adminTriple.guid = useguid;
182+
adminTriple.guid = shortUUID(guid());
179183
adminTriple.s = bnode;
180184
adminTriple.p = 'http://id.loc.gov/ontologies/bibframe/identifiedBy';
181185
adminTriple.o = mintedUri;
182186
adminTriple.otype = 'uri';
183187
bfeditor.bfestore.store.push(adminTriple);
184188

185189
adminTriple = {};
190+
adminTriple.guid = shortUUID(guid());
186191
adminTriple.s = mintedUri;
187192
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
188193
adminTriple.o = 'http://id.loc.gov/ontologies/bibframe/Local';
189194
adminTriple.otype = 'uri';
190195
bfeditor.bfestore.store.push(adminTriple);
191196

192197
adminTriple = {};
198+
adminTriple.guid = shortUUID(guid());
193199
adminTriple.s = mintedUri;
194200
adminTriple.p = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#value';
195201
adminTriple.o = mintedId;
@@ -206,6 +212,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
206212
bfeditor.bfestore.store = _.without(bfeditor.bfestore.store, _.findWhere(bfeditor.bfestore.store, { s: resourceURI, p: 'http://id.loc.gov/ontologies/bflc/procInfo' }));
207213

208214
var adminTriple = {};
215+
adminTriple.guid = shortUUID(guid());
209216
adminTriple.s = resourceURI;
210217
adminTriple.p = 'http://id.loc.gov/ontologies/bflc/procInfo';
211218
adminTriple.o = procInfo;
@@ -215,13 +222,22 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
215222

216223
exports.addProfile = function (resourceURI, profile) {
217224
var adminTriple = {};
225+
adminTriple.guid = shortUUID(guid());
218226
adminTriple.s = resourceURI;
219227
adminTriple.p = 'http://id.loc.gov/ontologies/bflc/profile';
220228
adminTriple.o = profile;
221229
adminTriple.otype = 'literal';
222230
bfeditor.bfestore.store.push(adminTriple);
223231
}
224232

233+
exports.removeOrphans = function (defaultURI) {
234+
_.forEach(exports.store, function(t) {
235+
if(!_.some(exports.store, {o:t.s}) && t.s !== defaultURI ){
236+
exports.store = _.without(exports.store, t);
237+
}
238+
})
239+
}
240+
225241
exports.storeDedup = function () {
226242
exports.store = _.uniq(exports.store, function (t) {
227243
if (t.olang !== undefined) {
@@ -310,7 +326,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
310326

311327
exports.jsonld2store = function (jsonld) {
312328
jsonld.forEach(function (resource) {
313-
var s = typeof resource['@id'] !== 'undefined' ? resource['@id'] : '_:b' + guid();
329+
var s = typeof resource['@id'] !== 'undefined' ? resource['@id'] : '_:b' + shortUUID(guid());
314330
for (var p in resource) {
315331
if (p !== '@id') {
316332
if (p === 'http://www.loc.gov/mads/rdf/v1#componentList'){
@@ -325,7 +341,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
325341
}
326342

327343
list.forEach(function (l) {
328-
var tguid = guid();
344+
var tguid = shortUUID(guid());
329345
var triple = {};
330346
triple.guid = tguid;
331347
triple.s = s;
@@ -336,7 +352,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
336352
});
337353

338354
} else if (p === '@type' && !_.isArray(resource[p])) {
339-
var tguid = guid();
355+
var tguid = shortUUID(guid());
340356
var triple = {};
341357
triple.guid = tguid;
342358
triple.s = s;
@@ -346,7 +362,7 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
346362
exports.store.push(triple);
347363
} else {
348364
resource[p].forEach(function (o) {
349-
var tguid = guid();
365+
var tguid = shortUUID(guid());
350366
var triple = {};
351367
triple.guid = tguid;
352368
if (p === '@type') {
@@ -593,4 +609,9 @@ bfe.define('src/bfestore', ['require', 'exports'], function (require, exports) {
593609
return translator.uuid();
594610
}
595611

612+
function shortUUID(uuid) {
613+
var translator = window.ShortUUID();
614+
return translator.fromUUID(uuid);
615+
}
616+
596617
});

0 commit comments

Comments
 (0)