Fixed gedcom read/write for URL and RESI problems

svn: r429

src/plugins/ReadGedcom.py

@@ -752,7 +752,9 @@ class GedcomParser:
 	        self.barf(level+1)
 
         if form == "url":
-            url = Url(file,title)
+            url = Url()
+            url.set_path(file)
+            url.set_description(title)
             self.person.addUrl(url)
         elif form in photo_types:
             path = find_file(file,self.dir_path)

src/plugins/WriteGedcom.py

@@ -245,18 +245,21 @@ def sortById(first,second):
 def write_long_text(g,tag,level,note):
     prefix = "%d %s" % (level,tag)
     textlines = string.split(note,'\n')
-    for line in textlines:
+    if len(note) == 0:
-        while len(line) > 0:
+        g.write("%s\n" % prefix)
-            if len(line) > 70:
+    else:
-                g.write("%s %s\n" % (prefix,line[0:70]))
+        for line in textlines:
-                line = line[70:]
+            while len(line) > 0:
-            else:
+                if len(line) > 70:
-                g.write("%s %s\n" % (prefix,line))
+                    g.write("%s %s\n" % (prefix,line[0:70]))
-                line = ""
+                    line = line[70:]
-            if len(line) > 0:
+                else:
-                prefix = "%d CONC" % (level + 1)
+                    g.write("%s %s\n" % (prefix,line))
-            else:
+                    line = ""
-                prefix = "%d CONT" % (level + 1)
+                if len(line) > 0:
+                    prefix = "%d CONC" % (level + 1)
+                else:
+                    prefix = "%d CONT" % (level + 1)
     
 #-------------------------------------------------------------------------
 #