From abc5ee412d5845816852f468556a09596d2a76b7 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 29 Jul 2010 19:23:05 -0700
Subject: [PATCH] DG IZ assiging the new profile to the person in the parse
 objects from xml

---
 app/models/profile.rb           |  5 -----
 lib/diaspora/diaspora_parser.rb | 12 ++++++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/models/profile.rb b/app/models/profile.rb
index 3098c1f52..112e9d988 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -27,11 +27,6 @@ class Profile
   def person_id
     self._parent_document.id
   end
-
-  def person_id= id
-    person = Person.first(:id => id)
-    person.profile = self
-  end
   
   def to_diaspora_xml
     "<post>"+ self.to_xml.to_s + "</post>"
diff --git a/lib/diaspora/diaspora_parser.rb b/lib/diaspora/diaspora_parser.rb
index f617c5809..4b6623dc9 100644
--- a/lib/diaspora/diaspora_parser.rb
+++ b/lib/diaspora/diaspora_parser.rb
@@ -24,7 +24,12 @@ module Diaspora
           object = post.name.camelize.constantize.from_xml post.to_s
           if object.respond_to? :person  
             object.person =  parse_owner_from_xml post.to_s 
-          end 
+          elsif object.is_a? Profile
+            puts "got into parse objects from xml PROFILE"
+            person = parse_owner_id_from_xml post
+            person.profile = object
+            person.save  
+          end
             objects << object
           #elsif object.is_a? Profile
           #  person = parse_owner_id_from_xml post
@@ -50,7 +55,10 @@ module Diaspora
           User.owner.receive_friend_request(p)
         #This line checks if the sender was in the database, among other things?
         elsif p.is_a? Profile
-          puts p.save
+
+          puts p.person_id
+
+          p.save
         elsif p.respond_to?(:person) && !(p.person.nil?) && !(p.person.is_a? User) #WTF
           Rails.logger.info("Saving object with success: #{p.save}")
         end