Skip to content
Snippets Groups Projects
Commit 5b3da462 authored by Bruno Nocera Zanette's avatar Bruno Nocera Zanette
Browse files

Fix IDs strings 


Fixed IDs strings.
IDs strings were being written with XML style, for example:
"uid":" uid="xyz"" instead of "uid":"xyz"

Signed-off-by: default avatarBruno Nocera Zanette <brunonzanette@gmail.com>
parent c4c7edc5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lib/json/group_section.py
+ 15
− 15
View file @ 5b3da462
......@@ -50,7 +50,7 @@ def write_groupmembers_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,3,"","{")
prefix='profile/'
user_attr=wrt.uidstr(wrt.urlparticipa(prefix,user_username))
user_attr=wrt.urlparticipa(prefix,user_username)
wrt.write_tag(xml,4,"uid",user_attr,",")
wrt.write_tag(xml,4,"usuario",user_name,"")
......@@ -87,11 +87,11 @@ def write_groupfiles_subsection (db, xml, group_guid):
file_link=wrt.urlparticipa(prefix,str(post_guid))
prefix='file/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -132,11 +132,11 @@ def write_groupforumtopics_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,3,"","{")
prefix='discussion/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -179,11 +179,11 @@ def write_groupbookmarks_subsection (db, xml, group_guid):
bookmark_link=wrt.post_content(db,post_guid,90)
prefix='bookmarks/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -224,11 +224,11 @@ def write_grouppages_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,3,"","{")
prefix='pages/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -271,11 +271,11 @@ def write_groupvideos_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,3,"","{")
prefix='videos/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -334,11 +334,11 @@ def write_groupevents_subsection (db, xml, group_guid):
organizer=wrt.post_content(db, post_guid, 30)
prefix='event_calendar/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_tag(xml,4,"pid",post_attr,",")
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,4,"uid",owner_attr,",")
wrt.write_tag(xml,4,"autor",owner_name,",")
......@@ -382,12 +382,12 @@ def write_groups_section(db, xml_file):
wrt.write_open_tag(xml,1,"","{")
prefix='groups/profile/'
group_attr=wrt.cidstr(wrt.urlparticipa(prefix,str(guid)))
group_attr=wrt.urlparticipa(prefix,str(guid))
wrt.write_tag(xml,4,"cid",group_attr,",")
# Write all group's information
prefix='profile/'
owner_attr=wrt.uidstr(wrt.urlparticipa(prefix,owner_username))
owner_attr=wrt.urlparticipa(prefix,owner_username)
wrt.write_tag(xml,2,"uid",owner_attr,",")
wrt.write_tag(xml,2,"proprietario",owner_name,",")
......
lib/json/user_section.py
+ 18
− 12
View file @ 5b3da462
......@@ -47,11 +47,11 @@ def write_userfriends_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{")
prefix='profile/'
friend_attr=wrt.uidstr(wrt.urlparticipa(prefix,friend_username))
friend_attr=wrt.urlparticipa(prefix,friend_username)
wrt.write_tag(xml,4,"uid",friend_attr,",")
wrt.write_tag(xml,4,"usuario",friend_name,"")
wrt.write_tag(xml,4,str(row),str(friends_info.rowcount),"")
wrt.write_close_tag(xml,3,"}",(row < friends_info.rowcount))
wrt.write_close_tag(xml,2,"]",True)
......@@ -75,7 +75,8 @@ def write_userowngroup_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,4,"","{")
prefix='groups/profile/'
group_attr=wrt.cidstr(wrt.urlparticipa(prefix,str(group_id)))
group_attr=wrt.urlparticipa(prefix,str(group_id))
wrt.write_tag(xml,5,"cid",group_attr,",")
wrt.write_tag(xml,5,"titulo",group_title,"")
......@@ -102,9 +103,10 @@ def write_usermembergroup_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,4,"","{")
prefix='groups/profile/'
group_attr=wrt.cidstr(wrt.urlparticipa(prefix,str(group_id)))
group_attr=wrt.urlparticipa(prefix,str(group_id))
wrt.write_tag(xml,5,"cid",group_attr,",")
wrt.write_tag(xml,5,"titulo",group_title,",")
wrt.write_tag(xml,5,"titulo",group_title,"")
wrt.write_close_tag(xml,4,"}",(row < user_membergroups.rowcount))
......@@ -140,7 +142,7 @@ def write_userfiles_subsection (db, xml, user_guid):
file_link=wrt.urlparticipa(prefix,str(post_guid))
prefix='file/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
......@@ -180,7 +182,7 @@ def write_userblogs_subsection (db, xml, user_guid):
post_excerpt=wrt.post_content(db,post_guid,64)
prefix='blog/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",")
......@@ -217,7 +219,7 @@ def write_userbookmarks_subsection (db, xml, user_guid):
bookmark_link=wrt.post_content(db,post_guid,90)
prefix='bookmarks/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",")
......@@ -251,7 +253,8 @@ def write_userpages_subsection (db, xml, user_guid):
row=row+1
prefix='pages/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",")
......@@ -285,7 +288,8 @@ def write_uservideos_subsection (db, xml, user_guid):
video_link=wrt.post_content(db, post_guid, 477)
prefix='videos/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",")
......@@ -338,7 +342,8 @@ def write_userevents_subsection (db, xml, user_guid):
organizer=wrt.post_content(db, post_guid, 30)
prefix='event_calendar/view/'
post_attr=wrt.pidstr(wrt.urlparticipa(prefix,str(post_guid)))
post_attr=wrt.urlparticipa(prefix,str(post_guid))
wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",")
......@@ -379,7 +384,8 @@ def write_users_section (db, xml_file):
row=row+1
prefix='profile/'
user_attr=wrt.uidstr(wrt.urlparticipa(prefix,username))
user_attr=wrt.urlparticipa(prefix,username)
wrt.write_open_tag(xml,1,"","{")
# Write all user's information
......
lib/json/write_support_functions.py
+ 2
− 1
View file @ 5b3da462
......@@ -198,7 +198,8 @@ def write_comments (db, xml, post_guid):
write_open_tag(xml,5,"","{")
prefix='profile/'
user_attr=uidstr(urlparticipa(prefix,user_username))
user_attr=urlparticipa(prefix,user_username)
write_tag(xml,6,"uid",user_attr,",")
write_tag(xml,6,"usuario",user_name,",")
write_tag(xml,6,"data",datestr(time),",")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment