mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #127 from aurimasv/rdf

Browse source 
Rdf tweaks
This commit is contained in:
Simon Kornblith 2012-05-12 09:31:33 -07:00
commit caad9aa4d6
3 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
chrome/content/zotero/xpcom/rdf/identity.js
View file

@ -202,7 +202,7 @@ We replace the bigger with the smaller.
moveIndex(this.classActions); moveIndex(this.classActions);
moveIndex(this.propertyActions); moveIndex(this.propertyActions);
tabulator.log.debug("Equate done. "+big+" now links to "+small) $rdf.log.debug("Equate done. "+big+" now links to "+small)
return true; // true means the statement does not need to be put in return true; // true means the statement does not need to be put in
}; };
@ -250,9 +250,7 @@ We replace the bigger with the smaller.
return new $rdf.Literal(val); // @@ differet types return new $rdf.Literal(val); // @@ differet types
if(typeof val == 'boolean') if(typeof val == 'boolean')
return new $rdf.Literal(val ? "1" : "0", undefined, $rdf.Symbol.prototype.XSDboolean); return new $rdf.Literal(val ? "1" : "0", undefined, $rdf.Symbol.prototype.XSDboolean);
else if(typeof val == 'number') if(typeof val == 'undefined')
return new $rdf.Literal('' + val); // @@ datatypes
else if(typeof val == 'undefined')
return undefined; return undefined;
else // @@ add converting of dates and numbers else // @@ add converting of dates and numbers
throw "Can't make Term from " + val + " of type " + typeof val; throw "Can't make Term from " + val + " of type " + typeof val;
@ -390,12 +388,11 @@ We replace the bigger with the smaller.
break; break;
} }
} }
if(st != null) results.push(st); if(st != null) {
results.push(st);
if(justOne)
break;
} }
if(justOne) {
if(results.length > 1)
results = results.slice(0, 1);
} }
return results; return results;
}; // statementsMatching }; // statementsMatching

14
chrome/content/zotero/xpcom/rdf/init.js
View file

@ -19,6 +19,10 @@ var $rdf = {
} }
throw "RDFArrayRemove: Array did not contain " + x; throw "RDFArrayRemove: Array did not contain " + x;
}, },
},
log: {
debug: Zotero.debug,
warn: Zotero.debug
} }
}; };
@ -28,11 +32,5 @@ if(Zotero.RDF) {
Zotero.RDF = {AJAW:$rdf}; Zotero.RDF = {AJAW:$rdf};
} }
var tabulator = { var tabulator = {log: $rdf.log};
log: { var alert = $rdf.log.warn;
debug: Zotero.debug,
warn: Zotero.debug
}
};
var alert = Zotero.debug;

3
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -2285,7 +2285,8 @@ Zotero.Translate.IO._RDFSandbox.prototype = {
"getArcsOut":"r", "getArcsOut":"r",
"getSources":"r", "getSources":"r",
"getTargets":"r", "getTargets":"r",
"getStatementsMatching":"r" "getStatementsMatching":"r",
"serialize":"r"
}, },
/** /**