suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #428, line endings missing in imported RIS notes

Browse Source
This commit is contained in:
Simon Kornblith 2006-12-12 17:05:29 +00:00
parent c5ec016ed9
commit 6e84f20de3
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scrapers.sql
View File

@ -1,4 +1,4 @@
-- 120 -- 121
-- ***** BEGIN LICENSE BLOCK ***** -- ***** BEGIN LICENSE BLOCK *****
-- --
@ -6095,7 +6095,7 @@ function doImport() {
} }
}'); }');
REPLACE INTO translators VALUES ('32d59d2d-b65a-4da4-b0a3-bdd3cfb979e7', '1.0.0b3.r1', '', '2006-10-02 17:00:00', 1, 100, 3, 'RIS', 'Simon Kornblith', 'ris', REPLACE INTO translators VALUES ('32d59d2d-b65a-4da4-b0a3-bdd3cfb979e7', '1.0.0b3.r1', '', '2006-12-11 12:02:00', 1, 100, 3, 'RIS', 'Simon Kornblith', 'ris',
'Zotero.configure("dataMode", "line"); 'Zotero.configure("dataMode", "line");
Zotero.addOption("exportNotes", true); Zotero.addOption("exportNotes", true);
@ -6329,8 +6329,11 @@ function doImport(attachments) {
var tag = "TY"; var tag = "TY";
var data = line.substr(6); var data = line.substr(6);
while((line = Zotero.read()) !== false) { // until EOF var rawLine;
line = line.replace(/^\s+/, ""); while((rawLine = Zotero.read()) !== false) { // until EOF
// trim leading space if this line is not part of a note
line = rawLine.replace(/^\s+/, "");
if(line.substr(2, 4) == " - ") { if(line.substr(2, 4) == " - ") {
// if this line is a tag, take a look at the previous line to map // if this line is a tag, take a look at the previous line to map
// its tag // its tag
@ -6357,11 +6360,16 @@ function doImport(attachments) {
} }
} else { } else {
// otherwise, assume this is data from the previous line continued // otherwise, assume this is data from the previous line continued
if(tag) { if(tag == "N1" || tag == "N2" || tag == "AB") {
// preserve line endings for N1/N2/AB fields, for EndNote
// compatibility
data += "\n"+rawLine;
} else if(tag) {
// otherwise, follow the RIS spec
if(data[data.length-1] == " ") { if(data[data.length-1] == " ") {
data += line; data += rawLine;
} else { } else {
data += " "+line; data += " "+rawLine;
} }
} }
} }
@ -6436,7 +6444,7 @@ function doExport() {
// notes // notes
if(Zotero.getOption("exportNotes")) { if(Zotero.getOption("exportNotes")) {
for(var j in item.notes) { for(var j in item.notes) {
addTag("N1", item.notes[j].note.replace(/[\r\n]/g, " ")); addTag("N1", item.notes[j].note.replace(/(?:\r\n?|\n)/g, "\r\n"));
} }
} }