From e35f254fa1153c4c42fa6835c8dd5d47308717ba Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 15 Aug 2013 15:35:58 -0400
Subject: [PATCH] Use API v2 in connector, part 1

---
 .../zotero/xpcom/connector/translate_item.js  | 109 ++++++++----------
 .../zotero/xpcom/translation/translate.js     |   4 +-
 chrome/content/zotero/xpcom/utilities.js      |  11 +-
 3 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/chrome/content/zotero/xpcom/connector/translate_item.js b/chrome/content/zotero/xpcom/connector/translate_item.js
index 60803612f1..545ae86da6 100644
--- a/chrome/content/zotero/xpcom/connector/translate_item.js
+++ b/chrome/content/zotero/xpcom/connector/translate_item.js
@@ -106,8 +106,6 @@ Zotero.Translate.ItemSaver.prototype = {
 		});
 	},
 	
-	// ALL CODE BELOW THIS POINT IS EXECUTED ONLY IN NON-FIREFOX ENVIRONMENTS
-	
 	/**
 	 * Polls for updates to attachment progress
 	 * @param items Items in Zotero.Item.toArray() format
@@ -162,6 +160,8 @@ Zotero.Translate.ItemSaver.prototype = {
 		poll();
 	},
 	
+	// ALL CODE BELOW THIS POINT IS EXECUTED ONLY IN NON-FIREFOX ENVIRONMENTS
+	
 	/**
 	 * Saves items to server
 	 * @param items Items in Zotero.Item.toArray() format
@@ -182,7 +182,7 @@ Zotero.Translate.ItemSaver.prototype = {
 		
 		for(var i=0, n=items.length; i<n; i++) {
 			var item = items[i];
-			newItems.push(Zotero.Utilities.itemToServerJSON(item));
+			newItems = newItems.concat(Zotero.Utilities.itemToServerJSON(item));
 			if(typedArraysSupported) {
 				for(var j=0; j<item.attachments.length; j++) {
 					item.attachments[j].id = Zotero.Utilities.randomString();
@@ -193,34 +193,40 @@ Zotero.Translate.ItemSaver.prototype = {
 		}
 		
 		var me = this;
-		Zotero.API.createItem({"items":newItems}, null, function(statusCode, response) {
-			if(statusCode !== 201) {
-				callback(false, new Error("Save to server failed"));
-			} else {
-				Zotero.debug("Translate: Save to server complete");
-				
-				Zotero.Prefs.getCallback(["downloadAssociatedFiles", "automaticSnapshots"],
-				function(prefs) {
-					if(typedArraysSupported) {
-						try {
-							var newKeys = me._getItemKeysFromServerResponse(response);
-						} catch(e) {
-							callback(false, e);
-							return;
-						}
-						
-						for(var i=0; i<items.length; i++) {
-							var item = items[i], key = newKeys[i];
-							if(item.attachments && item.attachments.length) {
-								me._saveAttachmentsToServer(key, me._getFileBaseNameFromItem(item),
-									item.attachments, prefs, attachmentCallback);
-							}
+		Zotero.API.createItem({"items":newItems}, function(statusCode, response) {
+			if(statusCode !== 200) {
+				callback(false, new Error("Save to server failed with "+statusCode+" "+response));
+				retrun;
+			}
+
+			try {
+				var resp = JSON.parse(response);
+			} catch(e) {
+				callback(false, new Error("Unexpected response received from server"));
+				return;
+			}
+			for(var i in resp.failed) {
+				callback(false, new Error("Save to server failed with "+statusCode+" "+response));
+				return;
+			}
+			
+			Zotero.debug("Translate: Save to server complete");
+			Zotero.Prefs.getCallback(["downloadAssociatedFiles", "automaticSnapshots"],
+			function(prefs) {
+
+				if(typedArraysSupported) {
+					Zotero.debug(response);
+					for(var i in resp.success) {
+						var item = items[i], key = resp.success[i];
+						if(item.attachments && item.attachments.length) {
+							me._saveAttachmentsToServer(key, me._getFileBaseNameFromItem(item),
+								item.attachments, prefs, attachmentCallback);
 						}
 					}
-					
-					callback(true, items);
-				});
-			}
+				}
+				
+				callback(true, items);
+			});
 		});
 	},
 	
@@ -235,6 +241,7 @@ Zotero.Translate.ItemSaver.prototype = {
 	 *     on failure or attachmentCallback(attachment, progressPercent) periodically during saving.
 	 */
 	"_saveAttachmentsToServer":function(itemKey, baseName, attachments, prefs, attachmentCallback) {
+						Zotero.debug("saveattachmentstoserver");
 		var me = this,
 			uploadAttachments = [],
 			retrieveHeadersForAttachments = attachments.length;
@@ -252,6 +259,7 @@ Zotero.Translate.ItemSaver.prototype = {
 				var attachment = uploadAttachments[i];
 				attachmentPayload.push({
 					"itemType":"attachment",
+					"parentItem":itemKey,
 					"linkMode":attachment.linkMode,
 					"title":(attachment.title ? attachment.title.toString() : "Untitled Attachment"),
 					"accessDate":"CURRENT_TIMESTAMP",
@@ -261,25 +269,23 @@ Zotero.Translate.ItemSaver.prototype = {
 				});
 			}
 			
-			Zotero.API.createItem({"items":attachmentPayload}, itemKey, function(statusCode, response) {
-				var err;
-				if(statusCode === 201) {
+			Zotero.API.createItem({"items":attachmentPayload}, function(statusCode, response) {
+				var resp;
+				if(statusCode === 200) {
 					try {
-						var newKeys = me._getItemKeysFromServerResponse(response);
-					} catch(e) {
-						err = new Error("Unexpected response received from server");
-					}
-				} else {
-					err = new Error("Unexpected status "+statusCode+" received from server");
+						resp = JSON.parse(response);
+						if(!resp.success) resp = undefined;
+					} catch(e) {};
 				}
 				
 				Zotero.debug("Finished creating items");
 				for(var i=0; i<uploadAttachments.length; i++) {
 					var attachment = uploadAttachments[i];
-					if(err) {
-						attachmentProgress(attachment, false, err);
+					if(!resp || !resp.success[i]) {
+						attachmentCallback(attachment, false,
+							new Error("Unexpected response received from server "+statusCode+" "+response));
 					} else {
-						attachment.key = newKeys[i];
+						attachment.key = resp.success[i];
 						
 						if(attachment.linkMode === "linked_url") {
 							attachmentCallback(attachment, 100);
@@ -288,8 +294,6 @@ Zotero.Translate.ItemSaver.prototype = {
 						}
 					}
 				}
-				
-				if(err) Zotero.logError(err);
 			});
 		};
 		
@@ -551,25 +555,6 @@ Zotero.Translate.ItemSaver.prototype = {
 		}
 	},
 	
-	/**
-	 * Gets item keys from a server response
-	 * @param {String} response ATOM response
-	 */
-	"_getItemKeysFromServerResponse":function(response) {
-		try {
-			response = (new DOMParser()).parseFromString(response, "text/xml");
-		} catch(e) {
-			throw new Error("Save to server returned invalid output");
-		}
-		var keyNodes = response.getElementsByTagNameNS("http://zotero.org/ns/api", "key");
-		var newKeys = [];
-		for(var i=0, n=keyNodes.length; i<n; i++) {
-			newKeys.push("textContent" in keyNodes[i] ? keyNodes[i].textContent
-				: keyNodes[i].innerText);
-		}
-		return newKeys;
-	},
-	
 	/**
 	 * Gets the base name for an attachment from an item object. This mimics the default behavior
 	 * of Zotero.Attachments.getFileBaseNameFromItem
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 7b0f527fca..b55ea26c22 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1748,7 +1748,7 @@ Zotero.Translate.Web.prototype._translateTranslatorLoaded = function() {
 			}, function(obj) { me._translateRPCComplete(obj) });
 	} else if(runMode === Zotero.Translator.RUN_MODE_ZOTERO_SERVER) {
 		var me = this;
-		Zotero.API.createItem({"url":this.document.location.href.toString()}, null,
+		Zotero.API.createItem({"url":this.document.location.href.toString()},
 			function(statusCode, response) {
 				me._translateServerComplete(statusCode, response);
 			});
@@ -1800,7 +1800,7 @@ Zotero.Translate.Web.prototype._translateServerComplete = function(statusCode, r
 				Zotero.API.createItem({
 						"url":me.document.location.href.toString(),
 						"items":selectedItems
-					}, null,
+					},
 					function(statusCode, response) {
 							me._translateServerComplete(statusCode, response);
 					});
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index b77b2b0e8d..2ebbfe7bfd 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -1259,7 +1259,11 @@ Zotero.Utilities = {
 	 * the content=json format used by the server
 	 */
 	"itemToServerJSON":function(item) {
-		var newItem = {}, newItems = [newItem];
+		var newItem = {
+				"itemKey":Zotero.Utilities.generateObjectKey(),
+				"itemVersion":0
+			},
+			newItems = [newItem];
 		
 		var typeID = Zotero.ItemTypes.getID(item.itemType);
 		if(!typeID) {
@@ -1347,7 +1351,8 @@ Zotero.Utilities = {
 						}
 						note = note.note;
 					}
-					newItems.push({"itemType":"note", "note":note.toString()});
+					newItems.push({"itemType":"note", "parentItem":newItem.itemKey,
+						"note":note.toString()});
 				}
 			} else if((fieldID = Zotero.ItemFields.getID(field))) {
 				// if content is not a string, either stringify it or delete it
@@ -1728,7 +1733,7 @@ Zotero.Utilities = {
 	"generateObjectKey":function getKey() {
 		// TODO: add 'L' and 'Y' after 3.0.11 cut-off
 		var baseString = "23456789ABCDEFGHIJKMNPQRSTUVWXZ";
-		return Zotero.randomString(8, baseString);
+		return Zotero.Utilities.randomString(8, baseString);
 	},
 
 	/**