Skip to content

Commit 7b508cf

Browse files
kirkhesskirkhess
committed
profile and code fixes
1 parent 1ff9bac commit 7b508cf

16 files changed

+387
-307
lines changed

‎builds/bfe.dev.js‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -459,18 +459,19 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
459459
text = _.find(data, "http://id.loc.gov/ontologies/bibframe/title")["http://id.loc.gov/ontologies/bibframe/title"];
460460
//return text["http://id.loc.gov/ontologies/bibframe/title"][0]["@value"];
461461
if (text !== undefined)
462-
if (text[0] !== undefined)
463-
if (text[0]["@id"] !== undefined) {
464-
id = text[0]["@id"]
462+
_.each(text, function(el){
463+
if (el["@id"] !== undefined) {
464+
id = el["@id"]
465465
title = _.where(data, {
466466
"@id": id
467467
});
468-
468+
469469
if (_.has(title[0], "http://id.loc.gov/ontologies/bibframe/mainTitle"))
470470
retval = title[0]["http://id.loc.gov/ontologies/bibframe/mainTitle"][0]["@value"];
471471
else if (_.has(title[0], "http://www.w3.org/2000/01/rdf-schema#label"))
472472
retval = title[0]["http://www.w3.org/2000/01/rdf-schema#label"][0]["@value"];
473473
}
474+
});
474475
} else if (_.some(data, "http://www.loc.gov/mads/rdf/v1#authoritativeLabel")) {
475476
retval = _.find(data, "http://www.loc.gov/mads/rdf/v1#authoritativeLabel")["http://www.loc.gov/mads/rdf/v1#authoritativeLabel"][0]["@value"]
476477
if (retval === undefined)
@@ -732,7 +733,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
732733

733734
var spoints = { label: "Loaded Work",
734735
type: ["http://id.loc.gov/ontologies/bibframe/Work"],
735-
useResourceTemplates:["profile:bf2:Load:Work"]
736+
useResourceTemplates:["profile:bf2:Monograph:Work"]
736737
};
737738

738739
bfeditor.bfestore.store = [];
@@ -765,6 +766,12 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
765766
if($('#bfeditor-messagediv').length){
766767
$('#bfeditor-messagediv').remove();
767768
}
769+
770+
_.each(bfeditor.bfestore.store, function(el) {
771+
if( el.o.startsWith("_:_:"))
772+
el.o = "_:" + el.o.split("_:")[2];
773+
774+
});
768775
cbLoadTemplates();
769776
});
770777

@@ -1513,7 +1520,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
15131520
//$formgroup.append($saves);
15141521
}
15151522

1516-
if (property.type === "resource" || property.type === "lookup") {
1523+
if (property.type === "resource" || property.type === "lookup" || property.type === "target") {
15171524

15181525
if (_.has(property, "valueConstraint")) {
15191526
if (_.has(property.valueConstraint, "valueTemplateRefs") && !_.isEmpty(property.valueConstraint.valueTemplateRefs)) {
@@ -2451,7 +2458,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
24512458
adminTriple.s = resourceURI;
24522459
adminTriple.p = "http://id.loc.gov/ontologies/bibframe/creationDate";
24532460
var d = new Date(bfeditor.bfestore.created);
2454-
adminTriple.o = d.getFullYear() + '-' + d.getMonth() + 1 + '-' + d.getDate();
2461+
adminTriple.o = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
24552462
adminTriple.otype = "literal";
24562463
triplespassed.push(adminTriple);
24572464
bfeditor.bfestore.store.push(adminTriple)

‎static/js/config-dev.js‎

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

‎static/profiles/bibframe/BIBFRAME 2.0 Cartographic.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
{
250250
"mandatory": "false",
251251
"repeatable": "true",
252-
"type": "resource",
252+
"type": "lookup",
253253
"resourceTemplates": [],
254254
"valueConstraint": {
255255
"valueTemplateRefs": [],
@@ -285,10 +285,12 @@
285285
{
286286
"mandatory": "false",
287287
"repeatable": "true",
288-
"type": "literal",
288+
"type": "resource",
289289
"resourceTemplates": [],
290290
"valueConstraint": {
291-
"valueTemplateRefs": [],
291+
"valueTemplateRefs": [
292+
"profile:bf2:Script"
293+
],
292294
"useValuesFrom": [],
293295
"valueDataType": {}
294296
},
@@ -464,7 +466,8 @@
464466
"valueDataType": {},
465467
"valueTemplateRefs": [
466468
"profile:bf2:Title",
467-
"profile:bf2:VariantTitle"
469+
"profile:bf2:Title:VarTitle",
470+
"profile:bf2:ParallelTitle"
468471
]
469472
}
470473
},

‎static/profiles/bibframe/BIBFRAME 2.0 Language.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
],
4343
"resourceURI": "http://id.loc.gov/ontologies/bibframe/Language",
4444
"id": "profile:bf2:Language",
45-
"resourceLabel": "Language",
45+
"resourceLabel": "Language (testing)",
4646
"remark": ""
4747
},
4848
{

‎static/profiles/bibframe/BIBFRAME 2.0 Monograph.json‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
{
281281
"mandatory": "false",
282282
"repeatable": "true",
283-
"type": "resource",
283+
"type": "lookup",
284284
"resourceTemplates": [],
285285
"valueConstraint": {
286286
"valueTemplateRefs": [],
@@ -316,10 +316,12 @@
316316
{
317317
"mandatory": "false",
318318
"repeatable": "true",
319-
"type": "literal",
319+
"type": "resource",
320320
"resourceTemplates": [],
321321
"valueConstraint": {
322-
"valueTemplateRefs": [],
322+
"valueTemplateRefs": [
323+
"profile:bf2:Script"
324+
],
323325
"useValuesFrom": [],
324326
"valueDataType": {}
325327
},
@@ -407,7 +409,8 @@
407409
"valueDataType": {}
408410
},
409411
"propertyURI": "http://id.loc.gov/ontologies/bibframe/hasExpression",
410-
"propertyLabel": "Related Expressions"
412+
"propertyLabel": "Related Expressions (RDA Chapter 26, Appendix J)",
413+
"remark": "http://access.rdatoolkit.org/rdachp26_rda26-25.html"
411414
},
412415
{
413416
"mandatory": "false",
@@ -468,11 +471,14 @@
468471
"valueConstraint": {
469472
"valueTemplateRefs": [
470473
"profile:bf2:Title",
471-
"profile:bf2:VariantTitle",
474+
"profile:bf2:Title:VarTitle",
475+
"profile:bf2:ParallelTitle",
472476
"profile:bflc:TranscribedTitle"
473477
],
474478
"useValuesFrom": [],
475-
"valueDataType": {}
479+
"valueDataType": {
480+
"remark": ""
481+
}
476482
},
477483
"mandatory": "false",
478484
"repeatable": "true",
@@ -1096,7 +1102,7 @@
10961102
"editable": "true",
10971103
"repeatable": "true"
10981104
},
1099-
"propertyURI": "http://www.w3.org/1999/02/22-rdf-syntax-ns#value",
1105+
"propertyURI": "http://id.loc.gov/ontologies/bflc/target",
11001106
"propertyLabel": "Intended Audience (RDA 7.7)",
11011107
"remark": "http://access.rdatoolkit.org/7.7.html"
11021108
},

‎static/profiles/bibframe/BIBFRAME 2.0 Moving Image: 35mm Feature Film.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
{
288288
"mandatory": "false",
289289
"repeatable": "true",
290-
"type": "resource",
290+
"type": "lookup",
291291
"resourceTemplates": [],
292292
"valueConstraint": {
293293
"valueTemplateRefs": [],
@@ -439,7 +439,8 @@
439439
"valueDataType": {}
440440
},
441441
"propertyURI": "http://id.loc.gov/ontologies/bibframe/hasExpression",
442-
"propertyLabel": "Related Expressions"
442+
"propertyLabel": "Related Expressions (RDA Chapter 26, Appendix J)",
443+
"remark": "http://access.rdatoolkit.org/rdachp26_rda26-25.html"
443444
},
444445
{
445446
"mandatory": "false",
@@ -515,7 +516,8 @@
515516
"valueConstraint": {
516517
"valueTemplateRefs": [
517518
"profile:bf2:Title",
518-
"profile:bf2:VariantTitle"
519+
"profile:bf2:Title:VarTitle",
520+
"profile:bf2:ParallelTitle"
519521
],
520522
"useValuesFrom": [],
521523
"valueDataType": {}

‎static/profiles/bibframe/BIBFRAME 2.0 Moving Image: BluRay DVD.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
{
309309
"mandatory": "false",
310310
"repeatable": "true",
311-
"type": "resource",
311+
"type": "lookup",
312312
"resourceTemplates": [],
313313
"valueConstraint": {
314314
"valueTemplateRefs": [],
@@ -502,7 +502,8 @@
502502
"valueDataType": {}
503503
},
504504
"propertyURI": "http://id.loc.gov/ontologies/bibframe/hasExpression",
505-
"propertyLabel": "Related Expressions"
505+
"propertyLabel": "Related Expressions (RDA Chapter 26, Appendix J)",
506+
"remark": "http://access.rdatoolkit.org/rdachp26_rda26-25.html"
506507
},
507508
{
508509
"mandatory": "false",
@@ -578,7 +579,8 @@
578579
"valueConstraint": {
579580
"valueTemplateRefs": [
580581
"profile:bf2:Title",
581-
"profile:bf2:VariantTitle"
582+
"profile:bf2:Title:VarTitle",
583+
"profile:bf2:ParallelTitle"
582584
],
583585
"useValuesFrom": [],
584586
"valueDataType": {}

‎static/profiles/bibframe/BIBFRAME 2.0 Notated Music.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
{
325325
"mandatory": "false",
326326
"repeatable": "true",
327-
"type": "resource",
327+
"type": "lookup",
328328
"resourceTemplates": [],
329329
"valueConstraint": {
330330
"valueTemplateRefs": [],
@@ -496,7 +496,8 @@
496496
"valueDataType": {}
497497
},
498498
"propertyURI": "http://id.loc.gov/ontologies/bibframe/hasExpression",
499-
"propertyLabel": "Related Expressions"
499+
"propertyLabel": "Related Expressions (RDA Chapter 26, Appendix J)",
500+
"remark": "http://access.rdatoolkit.org/rdachp26_rda26-25.html"
500501
},
501502
{
502503
"mandatory": "false",
@@ -557,11 +558,15 @@
557558
"valueConstraint": {
558559
"valueTemplateRefs": [
559560
"profile:bf2:Title",
560-
"profile:bf2:VariantTitle",
561-
"profile:bflc:TranscribedTitle"
561+
"profile:bf2:Title:VarTitle",
562+
"profile:bf2:ParallelTitle",
563+
"profile:bflc:TranscribedTitle",
564+
"profile:bf2:Title:CollTitle"
562565
],
563566
"useValuesFrom": [],
564-
"valueDataType": {}
567+
"valueDataType": {
568+
"remark": ""
569+
}
565570
},
566571
"mandatory": "false",
567572
"repeatable": "true",
@@ -1315,7 +1320,7 @@
13151320
{
13161321
"mandatory": "false",
13171322
"repeatable": "false",
1318-
"type": "lookup",
1323+
"type": "target",
13191324
"resourceTemplates": [],
13201325
"valueConstraint": {
13211326
"valueTemplateRefs": [],
@@ -1384,7 +1389,7 @@
13841389
{
13851390
"mandatory": "false",
13861391
"repeatable": "false",
1387-
"type": "lookup",
1392+
"type": "target",
13881393
"resourceTemplates": [],
13891394
"valueConstraint": {
13901395
"valueTemplateRefs": [],
@@ -1452,7 +1457,7 @@
14521457
{
14531458
"mandatory": "false",
14541459
"repeatable": "false",
1455-
"type": "lookup",
1460+
"type": "target",
14561461
"resourceTemplates": [],
14571462
"valueConstraint": {
14581463
"valueTemplateRefs": [],
@@ -1553,7 +1558,7 @@
15531558
}
15541559
],
15551560
"id": "profile:bf2:NotatedMusic:Notation",
1556-
"resourceURI": "http://id.loc.gov/ontologies/bibframe/Notation",
1561+
"resourceURI": "http://id.loc.gov/ontologies/bibframe/MusicNotation",
15571562
"resourceLabel": "Form of Musical Notation"
15581563
},
15591564
{
@@ -2342,7 +2347,7 @@
23422347
}
23432348
],
23442349
"contact": "NDMSO",
2345-
"date": "2017-05-13",
2350+
"date": "2018-02-13",
23462351
"description": "Work, Expression, Instance for Notated Music",
23472352
"id": "profile:bf2:NotatedMusic",
23482353
"title": "BIBFRAME 2.0 Notated Music",

‎static/profiles/bibframe/BIBFRAME 2.0 Note.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,26 @@
2222
"id": "profile:bf2:Note",
2323
"resourceURI": "http://id.loc.gov/ontologies/bibframe/Note",
2424
"resourceLabel": "Note"
25+
},
26+
{
27+
"propertyTemplates": [
28+
{
29+
"mandatory": "false",
30+
"repeatable": "true",
31+
"type": "literal",
32+
"resourceTemplates": [],
33+
"valueConstraint": {
34+
"valueTemplateRefs": [],
35+
"useValuesFrom": [],
36+
"valueDataType": {}
37+
},
38+
"propertyURI": "http://www.w3.org/2000/01/rdf-schema#label",
39+
"propertyLabel": "Script"
40+
}
41+
],
42+
"id": "profile:bf2:Script",
43+
"resourceURI": "http://id.loc.gov/ontologies/bibframe/Script",
44+
"resourceLabel": "Script"
2545
}
2646
],
2747
"id": "profile:bf2:Note",

‎static/profiles/bibframe/BIBFRAME 2.0 Rare Materials.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
{
208208
"mandatory": "false",
209209
"repeatable": "true",
210-
"type": "resource",
210+
"type": "lookup",
211211
"resourceTemplates": [],
212212
"valueConstraint": {
213213
"valueTemplateRefs": [],
@@ -361,11 +361,15 @@
361361
"valueConstraint": {
362362
"valueTemplateRefs": [
363363
"profile:bf2:Title",
364-
"profile:bf2:VariantTitle",
365-
"profile:bflc:TranscribedTitle"
364+
"profile:bf2:Title:VarTitle",
365+
"profile:bf2:ParallelTitle",
366+
"profile:bflc:TranscribedTitle",
367+
"profile:bf2:Title:CollTitle"
366368
],
367369
"useValuesFrom": [],
368-
"valueDataType": {}
370+
"valueDataType": {
371+
"remark": ""
372+
}
369373
},
370374
"propertyURI": "http://id.loc.gov/ontologies/bibframe/title",
371375
"propertyLabel": "Title Information"

0 commit comments

Comments
 (0)