Attributes values were not visible.Bug corrected

1 files changed, 25 insertions, 22 deletions

diff --git a/objectapp/models.py b/objectapp/models.py
index d6c7d308..cb9d467d 100644
--- a/objectapp/models.py
+++ b/objectapp/models.py
@@ -440,7 +440,7 @@ class Gbobject(Node):
 	g_json = {}
 	g_json["node_metadata"]= [] 
 	g_json["relations"]=[]
-	g_json["relset"]=[]
+	
 
 	global counter 
 	global attr_counter
@@ -455,47 +455,50 @@ class Gbobject(Node):
 
        
 
-        this_node = {"_id":str(self.id),"title":self.title,"screen_name":self.title, "url":self.get_absolute_url(),"expanded":"true"}
+        this_node = {"_id":str(self.id),"title":self.title,"screen_name":self.title, "url":self.get_absolute_url(),"expanded":"true","refType":self.reftype}
         g_json["node_metadata"].append(this_node)      
-	g_json["relset"].append(self.id)
+	
 
 	for key in predicate_id.keys():
 		if nbh[key]:
 			try:
-				#g_json[str(key)]=[] 
-				#g_json["relations"].append(key)    
+				
 				g_json["node_metadata"].append({"_id":str(predicate_id[key]),"screen_name":key})
-				#g_json[str(key)].append({"from":self.id , "to":predicate_id[key],"value":1, "level":1  })
+				
 				g_json["relations"].append({"from":self.id ,"type":str(key),"value":1,"to":predicate_id[key] })
 				if not isinstance(nbh[key],basestring):
                                     for item in nbh[key]:
-					if item.reftype!="Relation":
-                                        # create nodes
-
-					        g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title,"title":self.title, "url":item.get_absolute_url(),"expanded":"false"})
-						g_json["relset"].append(item.id) 
-						# g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1  })
-						#create links
-		                                g_json["relations"].append({"from":predicate_id[key] ,"type":str(key), "value":1,"to":item.id  })
+					if isinstance(item,unicode):
+						g_json["node_metadata"].append({"_id":(str(attr_counter)+"b"),"screen_name":str(item)})
+						g_json["relations"].append({"from":predicate_id[key] ,"type":str(key) ,"value":1,"to":(str(attr_counter)+"b") })
+                                   		attr_counter-=1
 
+					elif item.reftype!="Relation":
+                                        # create nodes
+						
+					        	g_json["node_metadata"].append({"_id":str(item.id),"screen_name":item.title,"title":self.title, "url":item.get_absolute_url(),"expanded":"false"})	
+							g_json["relations"].append({"from":predicate_id[key] ,"type":str(key), "value":1,"to":item.id  })
+					
+						
+							
 					else:
 						
 						 if item.left_subject.id==self.id:
 							item1=item.right_subject
+							flag=1
+							
 						 elif item.right_subject.id==self.id:
 							item1=item.left_subject
+							flag=0						
 						
-						 g_json["node_metadata"].append({"_id":str(item1.id),"screen_name":item1.title,"title":self.title, "url":item1.get_absolute_url(),"expanded":"false"})
+					         
+						 g_json["node_metadata"].append({"_id":str(item1.id),"screen_name":item1.title,"title":self.title, "url":item1.get_absolute_url(),"expanded":"false","refType":item.reftype,"inverse":item.relationtype.inverse,"flag":flag})
 
-						# g_json[str(key)].append({"from":predicate_id[key] , "to":item.id ,"value":1  })
-						#create links
+						
 		                                 g_json["relations"].append({"from":predicate_id[key] ,"type":str(key), "value":1,"to":item1.id  })
                                 else:
-				 	#value={nbh["plural"]:"a4",nbh["altnames"]:"a5"}			
-		            	 	#this_node[str(key)]=nbh[key] key, nbh[key]                                     
-				 	#for item in value.keys():
-                                    g_json["node_metadata"].append({"_id":(str(attr_counter)+"b"),"screen_name":nbh[key]})
-				    #g_json[str(key)].append({"from":predicate_id[key] , "to":attr_counter ,"value":1, "level":2 })
+				 	
+                                    g_json["node_metadata"].append({"_id":(str(attr_counter)+"b"),"screen_name":nbh[key]})				   
                                     g_json["relations"].append({"from":predicate_id[key] ,"type":str(key) ,"value":1,"to":(str(attr_counter)+"b") })
                                     attr_counter-=1