From: Randy Baumgarte <randy@fbn.cx>
Date: Tue, 17 Aug 2010 18:30:19 +0000 (-0400)
Subject: Alter import logic to create a new, unique GUID for each note. Prior to this it assum... 
X-Git-Tag: version0.1.1~410
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=dc131712cc767d1beea372b4efb3a6a374eeb29f

Alter import logic to create a new, unique GUID for each note. Prior to this it assumed that the note was deleted and expunged or it would fail with a duplicate GUID error.
---

diff --git a/src/cx/fbn/nevernote/xml/ImportData.java b/src/cx/fbn/nevernote/xml/ImportData.java
index 8a028d6..e85e492 100644
--- a/src/cx/fbn/nevernote/xml/ImportData.java
+++ b/src/cx/fbn/nevernote/xml/ImportData.java
@@ -22,6 +22,7 @@ package cx.fbn.nevernote.xml;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Random;
 
 import com.evernote.edam.type.Data;
 import com.evernote.edam.type.Note;
@@ -181,6 +182,14 @@ public class ImportData {
 			if (reader.isStartElement()) {
 				if (reader.name().equalsIgnoreCase("Guid")) 
 					note.setGuid(textValue());
+				if (!backup) {
+					Random random1 = new Random();
+					String newGuid = "IMP" +new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					note.setGuid(newGuid);
+				}
 				if (reader.name().equalsIgnoreCase("UpdateSequenceNumber")) 
 					note.setUpdateSequenceNum(intValue());
 				if (reader.name().equalsIgnoreCase("Title")) 
@@ -226,6 +235,14 @@ public class ImportData {
 			if (reader.isStartElement()) {
 				if (reader.name().equalsIgnoreCase("Guid")) 
 					resource.setGuid(textValue());
+				if (!backup) {
+					Random random1 = new Random();
+					String newGuid = "IMP" +new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					newGuid = newGuid+"-"+new Integer(random1.nextInt(1000)).toString();
+					resource.setGuid(newGuid);
+				}
 				if (reader.name().equalsIgnoreCase("NoteGuid")) 
 					resource.setNoteGuid(textValue());
 				if (reader.name().equalsIgnoreCase("UpdateSequenceNumber"))