Default for person first names, revert fix

Author: nursix

modules/eden/pr.py

@@ -544,7 +544,9 @@ def model(self):
                                    readable=False,
                                    writable=False,
                                    default=False),
-                             Field("first_name", notnull=True,
+                             Field("first_name",
+                                   notnull=True,
+                                   default="?",
                                    length=64, # Mayon Compatibility
                                    # NB Not possible to have an IS_NAME() validator here
                                    # http://eden.sahanafoundation.org/ticket/834

modules/s3/s3import.py

@@ -2726,14 +2726,14 @@ def add_item(self,
             components = model.get_components(table, names=components)
             for alias in components:
                 component = components[alias]
-                if component.link:
-                    target = component.link
-                else:
-                    target = component
-                ctable = component.table
-                ctablename = component.tablename
                 pkey = component.pkey
-                fkey = component.fkey
+                if component.linktable:
+                    ctable = component.linktable
+                    fkey = component.lkey
+                else:
+                    ctable = component.table
+                    fkey = component.fkey
+                ctablename = ctable._tablename
 
                 celements = xml.select_resources(element, ctablename)
                 if celements:
@@ -2905,7 +2905,7 @@ def lookahead(self,
                     if directory is not None:
                         entry = directory.get((tablename, attr, uid), None)
                     if not entry:
-                        expr = './/%s[@%s="%s" and @%s="%s"]' % (
+                        expr = ".//%s[@%s='%s' and @%s='%s']" % (
                                     xml.TAG.resource,
                                     xml.ATTRIBUTE.name,
                                     tablename,