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

fix collection import/export

Browse source
This commit is contained in:
Simon Kornblith 2010-11-06 20:52:15 +00:00
parent 8027e6c4f2
commit e531493ba0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/translation/item_local.js
View file

@ -132,7 +132,7 @@ Zotero.Translate.ItemSaver.prototype = {
var parentIDs = [null];
var topLevelCollection;
while(collectionsToProcess) {
while(collectionsToProcess.length) {
var collection = collectionsToProcess.shift();
var parentID = parentIDs.shift();
@ -143,8 +143,9 @@ Zotero.Translate.ItemSaver.prototype = {
var toAdd = [];
for each(child in collection.children) {
if(child.type == "collection") {
for(var i=0; i<collection.children.length; i++) {
var child = collection.children[i];
if(child.type === "collection") {
// do recursive processing of collections
collectionsToProcess.push(child);
parentIDs.push(newCollection.id);
@ -417,7 +418,6 @@ Zotero.Translate.ItemSaver.prototype = {
"_saveNotes":function(item, parentID) {
for(var i=0; i<item.notes.length; i++) {
var note = item.notes[i];
Zotero.debug(note);
var myNote = new Zotero.Item('note');
myNote.libraryID = this._libraryID;
myNote.setNote(typeof note == "object" ? note.note : note);
@ -516,7 +516,7 @@ Zotero.Translate.ItemGetter.prototype = {
if(this._collectionsLeft.length) {
// only include parent collection if there are actually children
this._collectionsLeft.unshift(getChildren);
this._collectionsLeft.unshift(collection);
}
// get items in child collections
@ -705,7 +705,7 @@ Zotero.Translate.ItemGetter.prototype = {
},
"nextCollection":function() {
if(!this._collectionsLeft || !this._collectionsLeft.length == 0) return false;
if(!this._collectionsLeft || this._collectionsLeft.length == 0) return false;
var returnItem = this._collectionsLeft.shift();
var obj = returnItem.serialize(true);

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

@ -435,8 +435,8 @@ Zotero.Translate.Sandbox = {
* @param {Object} collection
*/
"_collectionDone":function(translate, collection) {
var collection = translate._itemSaver.saveCollection(collection);
translate._runHandler("collectionDone", collection);
var newCollection = translate._itemSaver.saveCollection(collection);
translate._runHandler("collectionDone", newCollection);
}
},
@ -1189,7 +1189,7 @@ Zotero.Translate.Export.prototype._detect = function() {
Zotero.Translate.Export.prototype._prepareTranslation = function(libraryID, saveAttachments) {
// initialize ItemGetter
this._itemGetter = new Zotero.Translate.ItemGetter();
var getCollections = this._displayOptions.getCollections ? this._displayOptions.getCollections : false;
var getCollections = this.translator[0].configOptions.getCollections ? this.translator[0].configOptions.getCollections : false;
if(this._collection) {
this._itemGetter.setCollection(this._collection, getCollections);
delete this._collection;