Skip to content

Commit 1039f20

Browse files
committed
- Mark import/export translators as node.js compatible
- Remove array comprehensions from Bibliontology RDF.js and Zotero RDF.js
1 parent 72fe879 commit 1039f20

9 files changed

+64
-27
lines changed

BibTeX.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
},
1717
"inRepository": true,
1818
"translatorType": 3,
19-
"browserSupport": "gcs",
20-
"lastUpdated": "2011-07-05 00:48:01"
19+
"browserSupport": "gcsn",
20+
"lastUpdated": "2011-07-08 04:50:39"
2121
}
2222

2323
function detectImport() {

Bibliontology RDF.js

+38-12
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
"minVersion":"2.0",
88
"maxVersion":"",
99
"priority":50,
10+
"browserSupport":"gcs",
1011
"configOptions":{"getCollections":"true", "dataMode":"rdf/xml"},
1112
"displayOptions":{"exportNotes":true, "exportFileData":false},
1213
"inRepository":false,
13-
"lastUpdated":"2011-02-22 00:39:57"
14+
"lastUpdated":"2011-07-08 04:50:39"
1415
}
1516

1617
var n = {
@@ -233,11 +234,19 @@ var FIELDS = {
233234
"assignee": [ITEM, n.z+"assignee"], // TODO
234235
"priorityNumbers": [function(item) { // TODO
235236
var priorityNumbers = item.priorityNumbers.split(/, ?| /g);
236-
return [[ITEM, n.z+"priorityNumber", number, true] for each(number in priorityNumbers)];
237+
var returnNumbers = [];
238+
for each(var number in priorityNumbers) {
239+
returnNumbers.push([ITEM, n.z+"priorityNumber", number, true]);
240+
}
241+
return returnNumbers;
237242
}, function(nodes) {
238243
var statements = Zotero.RDF.getStatementsMatching(nodes[ITEM], n.z+"priorityNumber", null);
239244
if(!statements) return false;
240-
return [statement[2] for each(statement in statements)].join(", ");
245+
var predicates = [];
246+
for each(var statement in statements) {
247+
predicates.push(statement[2]);
248+
}
249+
return predicates.join(", ");
241250
}],
242251
"references": [ITEM, n.z+"references"],
243252
"legalStatus": [ITEM, n.bibo+"status"],
@@ -332,7 +341,9 @@ function getBlankNode(attachToNode, itemPredicate, blankNodePairs, create) {
332341
if(!blankNode && create) {
333342
blankNode = Zotero.RDF.newResource();
334343
Zotero.RDF.addStatement(attachToNode, itemPredicate, blankNode, false);
335-
[Zotero.RDF.addStatement(blankNode, pair[0], pair[1], false) for each(pair in blankNodePairs)];
344+
for each(var pair in blankNodePairs) {
345+
Zotero.RDF.addStatement(blankNode, pair[0], pair[1], false);
346+
}
336347
}
337348

338349
return blankNode;
@@ -362,7 +373,11 @@ Type.prototype.getMatchScore = function(node) {
362373
var nodes = {2:node};
363374

364375
// check item (+2 for each match, -1 for each nonmatch)
365-
var score = 3*[true for each(pair in this[ITEM].pairs) if(Zotero.RDF.getStatementsMatching(node, pair[0], pair[1]))].length-this[ITEM].pairs.length;
376+
var score = -this[ITEM].pairs.length;
377+
for each(var pair in this[ITEM].pairs) {
378+
if(Zotero.RDF.getStatementsMatching(node, pair[0], pair[1])) score += 3;
379+
}
380+
366381
// check subcontainer
367382
[score, nodes[SUBCONTAINER]] = this._scoreNodeRelationship(node, this[SUBCONTAINER], score);
368383
// check container
@@ -387,7 +402,11 @@ Type.prototype._scoreNodeRelationship = function(node, definition, score) {
387402
var bestScore = -9999;
388403
for each(var statement in statements) {
389404
// +2 for each match, -1 for each nonmatch
390-
var testScore = 3*[true for each(pair in definition.pairs) if(Zotero.RDF.getStatementsMatching(statement[2], pair[0], pair[1]))].length-definition.pairs.length;
405+
var testScore = -definition.pairs.length;
406+
for each(var pair in definition.pairs) {
407+
if(Zotero.RDF.getStatementsMatching(statement[2], pair[0], pair[1])) score += 3;
408+
}
409+
391410
if(testScore > bestScore) {
392411
subNode = statement[2];
393412
bestScore = testScore;
@@ -462,8 +481,9 @@ Type.prototype.addNodeRelations = function(nodes) {
462481
}
463482

464483
// add type
465-
[Zotero.RDF.addStatement(nodes[i], pair[0], pair[1], false)
466-
for each(pair in this[i].pairs)];
484+
for each(var pair in this[i].pairs) {
485+
Zotero.RDF.addStatement(nodes[i], pair[0], pair[1], false)
486+
}
467487

468488
// add relation to parent
469489
for(var j = i-1; j>1; j--) {
@@ -560,7 +580,12 @@ LiteralProperty.prototype.mapToItem = function(newItem, nodes) {
560580
if(!node) return false;
561581
var statements = getStatementsByDefinition(this.mapping[1], node);
562582
if(!statements) return false;
563-
newItem[this.field] = [stmt[2].toString() for each(stmt in statements)].join(", ");
583+
584+
var content = [];
585+
for each(var stmt in statements) {
586+
content.push(stmt[2].toString());
587+
}
588+
newItem[this.field] = content.join(",");
564589
}
565590
return true;
566591
}
@@ -571,8 +596,9 @@ LiteralProperty.prototype.mapToItem = function(newItem, nodes) {
571596
LiteralProperty.prototype.mapFromItem = function(item, nodes) {
572597
if(typeof this.mapping[0] == "function") { // function case: triples returned
573598
// check function case
574-
[Zotero.RDF.addStatement(nodes[triple[0]], triple[1], triple[2], triple[3])
575-
for each(triple in this.mapping[0](item))];
599+
for each(var triple in this.mapping[0](item)) {
600+
Zotero.RDF.addStatement(nodes[triple[0]], triple[1], triple[2], triple[3])
601+
}
576602
} else if(typeof this.mapping[1] == "string") { // string case: simple predicate
577603
Zotero.RDF.addStatement(nodes[this.mapping[0]],
578604
this.mapping[1], item.uniqueFields[this.field], true);
@@ -975,7 +1001,7 @@ var usedURIs = {};
9751001

9761002
function doExport() {
9771003
// add namespaces
978-
[Zotero.RDF.addNamespace(i, n[i]) for(i in n)];
1004+
for(var i in n) Zotero.RDF.addNamespace(i, n[i]);
9791005

9801006
// compile references and create URIs
9811007
var item;

Bookmarks.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"minVersion":"2.1b6",
88
"maxVersion":"",
99
"priority":100,
10+
"browserSupport":"gcsn",
1011
"inRepository":true,
11-
"lastUpdated":"2011-03-16 23:24:54"
12+
"lastUpdated":"2011-07-08 04:51:41"
1213
}
1314

1415
/*

RDF.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"minVersion":"2.1.9",
88
"maxVersion":"",
99
"priority":100,
10-
"browserSupport":"gcs",
10+
"browserSupport":"gcsn",
1111
"configOptions":{"dataMode":"rdf/xml"},
1212
"inRepository":true,
13-
"lastUpdated":"2011-07-04 04:58:27"
13+
"lastUpdated":"2011-07-08 04:51:41"
1414
}
1515

1616
function detectImport() {

RIS.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"minVersion":"2.1.3",
88
"maxVersion":"",
99
"priority":100,
10-
"browserSupport":"gcs",
10+
"browserSupport":"gcsn",
1111
"inRepository":true,
1212
"displayOptions":{"exportCharset":"UTF-8", "exportNotes":true},
13-
"lastUpdated":"2011-06-17 20:07:40"
13+
"lastUpdated":"2011-07-08 04:51:41"
1414
}
1515

1616
function detectImport() {

ReferBibIX.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
"minVersion":"1.0.0b4.r5",
88
"maxVersion":"",
99
"priority":100,
10+
"browserSupport":"gcsn",
1011
"configOptions":{"dataMode":"line"},
1112
"displayOptions":{"exportCharset":"UTF-8"},
1213
"inRepository":true,
13-
"lastUpdated":"2011-01-11 04:31:00"
14+
"lastUpdated":"2011-07-08 04:51:41"
1415
}
1516

1617
function detectImport() {

Unqualified Dublin Core RDF.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
"minVersion":"1.0.0b3.r1",
88
"maxVersion":"",
99
"priority":100,
10+
"browserSupport":"gcsn",
1011
"configOptions":{"dataMode":"rdf/xml"},
1112
"inRepository":true,
12-
"lastUpdated":"2011-01-11 04:31:00"
13+
"lastUpdated":"2011-07-08 04:51:41"
1314
}
1415

1516
function doExport() {

Wikipedia Citation Templates.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
"maxVersion":"",
99
"priority":100,
1010
"displayOptions":{"exportCharset":"UTF-8"},
11+
"browserSupport":"gcsn",
1112
"inRepository":true,
12-
"lastUpdated":"2011-01-11 04:31:00"
13+
"lastUpdated":"2011-07-08 04:51:41"
1314
}
1415

1516
var fieldMap = {

Zotero RDF.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
"configOptions":{"getCollections":"true", "dataMode":"rdf/xml"},
1111
"displayOptions":{"exportNotes":true, "exportFileData":false},
1212
"inRepository":true,
13-
"lastUpdated":"2011-01-11 04:31:00"
13+
"lastUpdated":"2011-07-08 04:51:41"
1414
}
1515

16+
var item;
1617
var rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
1718

1819
var n = {
@@ -79,15 +80,21 @@ function generateCollection(collection) {
7980
*/
8081
function getDisplayTitle(item) {
8182
if(!item.title && (item.itemType == "interview" || item.itemType == "letter")) {
82-
var participants = [creator for each(creator in item.creators)
83+
var participants = []
84+
for each(var creator in item.creators) {
8385
if (item.itemType == "letter" && creator.creatorType == "recipient" ||
84-
item.itemType == "interview" && creator.creatorType == "interviewer")];
86+
item.itemType == "interview" && creator.creatorType == "interviewer") {
87+
participants.push(creator);
88+
}
89+
}
8590

8691
var displayTitle = "["+(item.itemType == "letter" ? "Letter" : "Interview");
8792
if(participants.length) {
8893
//var names = [creator.firstName ? creator.firstName+" "+creator.lastName : creator.lastName
89-
var names = [creator.lastName
90-
for each(creator in participants)];
94+
var names = [];
95+
for each(var creator in participants) {
96+
names.push(creator.lastName);
97+
}
9198

9299
displayTitle += (item.itemType == "letter" ? " to " : " of ")+names[0];
93100

0 commit comments

Comments
 (0)