Skip to content

Commit 09da277

Browse files
kirkhesskirkhess
committed
code fixes, profile fixes
1 parent bfb32eb commit 09da277

4 files changed

Lines changed: 80 additions & 53 deletions

File tree

‎builds/bfe.dev.js‎

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -491,39 +491,32 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
491491
}
492492
}
493493
console.log(full.id);
494-
495-
if (text !== "N/A" && full.status === "published"){
494+
if (text !== "N/A" && full.status === "published" || full.status === "success"){
496495
var ldsurl = "http://mlvlp04.loc.gov:8230/loc.natlib.instances.e" + text.trim() + "0001";
497496
if (text.trim().startsWith("n"))
498497
ldsurl = "http://mlvlp04.loc.gov:8230/loc.natlib.works." + text.trim().replace(/\s+/g,'');
499498

500499
var lccn = text.trim();
501500
var table = new $.fn.dataTable.Api( meta.settings );
502501
var cell = table.cell(meta.row, meta.col);
503-
504-
$.ajax({
505-
type: "HEAD",
506-
async: true,
507-
data: { uri: ldsurl },
508-
url: config.url + "/profile-edit/server/checkuri",
509-
}).done(function(data){
510-
cell.node().innerHTML = "<a href=\""+ldsurl+"\">" + lccn + "</a>";
502+
if (full.status === "success"){
503+
cell.node().innerHTML = "<a href=\""+ldsurl+"\">" + lccn + "</a>";
511504
$(cell.node()).css('background-color', 'lightgreen');
512-
}).fail(function(data, text){
513-
if (full.status === "published"){
514-
$(cell.node()).css('background-color', 'lightcoral');
515-
}
516-
/*else {
517-
var resourceuri = "http://mlvlp04.loc.gov:3000/resources/"+table.cell(meta.row,1).node().innerHTML+".rdf";
518-
$.ajax({
519-
type: "HEAD",
520-
async:true,
521-
url: resourceuri,
522-
}).done( function (data){
523-
$(cell.node()).css('background-color', 'lightcoral');
524-
});
525-
}*/
526-
});
505+
} else {
506+
$.ajax({
507+
type: "HEAD",
508+
async: true,
509+
data: { uri: ldsurl },
510+
url: config.url + "/profile-edit/server/checkuri",
511+
}).done(function(data){
512+
cell.node().innerHTML = "<a href=\""+ldsurl+"\">" + lccn + "</a>";
513+
$(cell.node()).css('background-color', 'lightgreen');
514+
}).fail(function(data, text){
515+
if (full.status === "published"){
516+
$(cell.node()).css('background-color', 'lightcoral');
517+
}
518+
});
519+
}
527520
}
528521

529522
return text;
@@ -1024,9 +1017,9 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
10241017
if(_.some(bfeditor.bfestore.store, {"p":"http://id.loc.gov/ontologies/bibframe/adminMetadata"})){
10251018

10261019
var modifiedDate = new Date(save_json.modified);
1027-
var modifiedDateString = modifiedDate.getFullYear(); + '-' + modifiedDate.getMonth() + 1 + '-' + modifiedDate.getDate();
1020+
var modifiedDateString = modifiedDate.toJSON().split(/\./)[0];
10281021

1029-
if (!_.has(bfeditor.bfestore.store, {p: "http://id.loc.gov/ontologies/bibframe/changeDate"})){
1022+
if (_.has(bfeditor.bfestore.store, {p: "http://id.loc.gov/ontologies/bibframe/changeDate"})){
10301023
_.find(bfeditor.bfestore.store, {p:"http://id.loc.gov/ontologies/bibframe/changeDate"}).o = modifiedDateString;
10311024
} else {
10321025
var adminTriple = {};
@@ -1081,6 +1074,24 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
10811074
save_json.url = bfeditor.bfestore.url;
10821075
save_json.created = bfeditor.bfestore.created;
10831076
save_json.modified = new Date().toUTCString();
1077+
1078+
if(_.some(bfeditor.bfestore.store, {"p":"http://id.loc.gov/ontologies/bibframe/adminMetadata"})){
1079+
1080+
var modifiedDate = new Date(save_json.modified);
1081+
var modifiedDateString = modifiedDate.toJSON().split(/\./)[0];
1082+
1083+
if (_.has(bfeditor.bfestore.store, {p: "http://id.loc.gov/ontologies/bibframe/changeDate"})){
1084+
_.find(bfeditor.bfestore.store, {p:"http://id.loc.gov/ontologies/bibframe/changeDate"}).o = modifiedDateString;
1085+
} else {
1086+
var adminTriple = {};
1087+
adminTriple.s = _.find(bfeditor.bfestore.store, {"p":"http://id.loc.gov/ontologies/bibframe/adminMetadata"}).o;
1088+
adminTriple.p = "http://id.loc.gov/ontologies/bibframe/changeDate";
1089+
adminTriple.o = modifiedDateString;
1090+
adminTriple.otype = "literal";
1091+
bfeditor.bfestore.store.push(adminTriple)
1092+
}
1093+
}
1094+
10841095
save_json.status = "published";
10851096
save_json.objid = "loc.natlib.instances." + save_json.name + "0001";
10861097
save_json.id = save_json.name;
@@ -1215,7 +1226,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
12151226
if (!_.isEmpty(worklist)){
12161227
//check for type
12171228

1218-
var rtType = _.where(worklist, {"p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"});
1229+
var rtType = _.where(worklist, {"p": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type", o: fobject.resourceTemplates[urt].resourceURI});
12191230

12201231
if (!_.isEmpty(rtType)){
12211232
fobject.resourceTemplates[urt].defaulturi = rtType[0].s
@@ -1860,7 +1871,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
18601871
var $buttongroup = editDeleteButtonGroup(bgvars);
18611872
$save.append($buttongroup);
18621873

1863-
if (property.valueConstraint.repeatable !== undefined && property.valueConstraint.repeatable == "false") {
1874+
if (property.repeatable === "false" || property.valueConstraint.repeatable == "false") {
18641875
var $el = $("#" + property.guid, form);
18651876
if ($el.is("input")) {
18661877
$el.prop("disabled", true);
@@ -2087,7 +2098,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
20872098
var $buttongroup = editDeleteButtonGroup(bgvars);
20882099

20892100
$save.append($buttongroup);
2090-
if (property.valueConstraint !== undefined && property.valueConstraint.repeatable !== undefined && property.valueConstraint.repeatable == "false") {
2101+
if (property.repeatable === "false" || property.valueConstraint.repeatable == "false") {
20912102
var $el = $("#" + property.guid, form);
20922103
if ($el.is("input")) {
20932104
$el.prop("disabled", true);
@@ -2176,7 +2187,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
21762187
adminTriple.s = resourceURI;
21772188
adminTriple.p = "http://id.loc.gov/ontologies/bibframe/creationDate";
21782189
var d = new Date(bfeditor.bfestore.created);
2179-
adminTriple.o = d.getFullYear(); + '-' + d.getMonth() + 1 + '-' + d.getDate();
2190+
adminTriple.o = d.getFullYear() + '-' + d.getMonth() + 1 + '-' + d.getDate();
21802191
adminTriple.otype = "literal";
21812192
triplespassed.push(adminTriple);
21822193
bfeditor.bfestore.store.push(adminTriple)
@@ -2885,7 +2896,7 @@ bfe.define('src/bfe', ['require', 'exports', 'module', 'src/bfestore', 'src/bfel
28852896
$("#" + pguid, formobject.form).typeahead('val', "");
28862897
$("#" + pguid, formobject.form).typeahead('close');
28872898

2888-
if (property.valueConstraint !== undefined && property.valueConstraint.repeatable !== undefined && property.valueConstraint.repeatable == "false") {
2899+
if (property.repeatable === "false" || property.valueConstraint.repeatable == "false") {
28892900
var $el = $("#" + pguid, formobject.form);
28902901
if ($el.is("input")) {
28912902
$el.prop("disabled", true);

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,22 @@
131131
"propertyLabel": "Intended Audience (RDA 7.7)",
132132
"remark": "http://access.rdatoolkit.org/7.7.html"
133133
},
134+
{
135+
"mandatory": "false",
136+
"repeatable": "true",
137+
"type": "resource",
138+
"resourceTemplates": [],
139+
"valueConstraint": {
140+
"valueTemplateRefs": [
141+
"profile:bf2:Agents:Contribution"
142+
],
143+
"useValuesFrom": [],
144+
"valueDataType": {}
145+
},
146+
"propertyURI": "http://id.loc.gov/ontologies/bibframe/contribution",
147+
"propertyLabel": "Contributor (RDA 20.2)",
148+
"remark": "http://access.rdatoolkit.org/20.2.html"
149+
},
134150
{
135151
"mandatory": "false",
136152
"repeatable": "true",

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
"propertyTemplates": [
253253
{
254254
"mandatory": "false",
255-
"repeatable": "true",
255+
"repeatable": "false",
256256
"type": "literal",
257257
"resourceTemplates": [],
258258
"valueConstraint": {
@@ -272,7 +272,7 @@
272272
"propertyTemplates": [
273273
{
274274
"mandatory": "false",
275-
"repeatable": "true",
275+
"repeatable": "false",
276276
"type": "literal",
277277
"resourceTemplates": [],
278278
"valueConstraint": {
@@ -323,7 +323,7 @@
323323
"propertyTemplates": [
324324
{
325325
"mandatory": "false",
326-
"repeatable": "true",
326+
"repeatable": "false",
327327
"type": "literal",
328328
"resourceTemplates": [],
329329
"valueConstraint": {
@@ -372,7 +372,7 @@
372372
"propertyTemplates": [
373373
{
374374
"mandatory": "false",
375-
"repeatable": "true",
375+
"repeatable": "false",
376376
"type": "literal",
377377
"resourceTemplates": [],
378378
"valueConstraint": {
@@ -407,7 +407,7 @@
407407
"propertyTemplates": [
408408
{
409409
"mandatory": "false",
410-
"repeatable": "true",
410+
"repeatable": "false",
411411
"type": "literal",
412412
"resourceTemplates": [],
413413
"valueConstraint": {
@@ -474,7 +474,7 @@
474474
"propertyTemplates": [
475475
{
476476
"mandatory": "false",
477-
"repeatable": "true",
477+
"repeatable": "false",
478478
"type": "literal",
479479
"resourceTemplates": [],
480480
"valueConstraint": {
@@ -523,7 +523,7 @@
523523
"propertyTemplates": [
524524
{
525525
"mandatory": "false",
526-
"repeatable": "true",
526+
"repeatable": "false",
527527
"type": "literal",
528528
"resourceTemplates": [],
529529
"valueConstraint": {
@@ -572,7 +572,7 @@
572572
"propertyTemplates": [
573573
{
574574
"mandatory": "false",
575-
"repeatable": "true",
575+
"repeatable": "false",
576576
"type": "literal",
577577
"resourceTemplates": [],
578578
"valueConstraint": {
@@ -640,7 +640,7 @@
640640
"propertyTemplates": [
641641
{
642642
"mandatory": "false",
643-
"repeatable": "true",
643+
"repeatable": "false",
644644
"type": "literal",
645645
"resourceTemplates": [],
646646
"valueConstraint": {
@@ -708,7 +708,7 @@
708708
"propertyTemplates": [
709709
{
710710
"mandatory": "false",
711-
"repeatable": "true",
711+
"repeatable": "false",
712712
"type": "literal",
713713
"resourceTemplates": [],
714714
"valueConstraint": {
@@ -746,7 +746,7 @@
746746
"propertyTemplates": [
747747
{
748748
"mandatory": "false",
749-
"repeatable": "true",
749+
"repeatable": "false",
750750
"type": "literal",
751751
"resourceTemplates": [],
752752
"valueConstraint": {
@@ -796,7 +796,7 @@
796796
"propertyTemplates": [
797797
{
798798
"mandatory": "false",
799-
"repeatable": "true",
799+
"repeatable": "false",
800800
"type": "literal",
801801
"resourceTemplates": [],
802802
"valueConstraint": {
@@ -844,7 +844,7 @@
844844
"propertyTemplates": [
845845
{
846846
"mandatory": "false",
847-
"repeatable": "true",
847+
"repeatable": "false",
848848
"type": "literal",
849849
"resourceTemplates": [],
850850
"valueConstraint": {
@@ -896,7 +896,7 @@
896896
"propertyTemplates": [
897897
{
898898
"mandatory": "false",
899-
"repeatable": "true",
899+
"repeatable": "false",
900900
"type": "literal",
901901
"resourceTemplates": [],
902902
"valueConstraint": {
@@ -960,7 +960,7 @@
960960
"propertyTemplates": [
961961
{
962962
"mandatory": "false",
963-
"repeatable": "true",
963+
"repeatable": "false",
964964
"type": "literal",
965965
"resourceTemplates": [],
966966
"valueConstraint": {
@@ -1024,7 +1024,7 @@
10241024
"propertyTemplates": [
10251025
{
10261026
"mandatory": "false",
1027-
"repeatable": "true",
1027+
"repeatable": "false",
10281028
"type": "literal",
10291029
"resourceTemplates": [],
10301030
"valueConstraint": {
@@ -1073,7 +1073,7 @@
10731073
"propertyTemplates": [
10741074
{
10751075
"mandatory": "false",
1076-
"repeatable": "true",
1076+
"repeatable": "false",
10771077
"type": "literal",
10781078
"resourceTemplates": [],
10791079
"valueConstraint": {
@@ -1137,7 +1137,7 @@
11371137
"propertyTemplates": [
11381138
{
11391139
"mandatory": "false",
1140-
"repeatable": "true",
1140+
"repeatable": "false",
11411141
"type": "literal",
11421142
"resourceTemplates": [],
11431143
"valueConstraint": {
@@ -1186,7 +1186,7 @@
11861186
"propertyTemplates": [
11871187
{
11881188
"mandatory": "false",
1189-
"repeatable": "true",
1189+
"repeatable": "false",
11901190
"type": "literal",
11911191
"resourceTemplates": [],
11921192
"valueConstraint": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
}
160160
},
161161
"propertyURI": "http://id.loc.gov/ontologies/bibframe/contribution",
162-
"propertyLabel": "Other Agent Associated with Work (RDA 19.3)",
163-
"remark": "http://access.rdatoolkit.org/19.3.html"
162+
"propertyLabel": "Contributor (RDA 19.3 and 20.2)",
163+
"remark": "http://access.rdatoolkit.org/20.2.html"
164164
},
165165
{
166166
"mandatory": "false",

0 commit comments

Comments
 (0)