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

Fix Bad Chars on Text (Better Solution)


This commits implements a better solution to the problem.
Actually the problem was with '\n' and '\r', and not with HTML tags.
This fix simply substitute this chars for ' ' (space).
Now, the text encoding is not needed anymore!

Signed-off-by: default avatarBruno Nocera Zanette <brunonzanette@gmail.com>
parent 6bcfb6f2
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,7 @@ def write_groupmembers_subsection (db, xml, group_guid): ...@@ -54,7 +54,7 @@ def write_groupmembers_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"usuario","{") wrt.write_open_tag(xml,4,"usuario","{")
wrt.write_tag(xml,5,"uid",user_attr,",") wrt.write_tag(xml,5,"uid",user_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(user_name),"") wrt.write_tag(xml,5,"nome",user_name,"")
wrt.write_close_tag(xml,4,"}",False) wrt.write_close_tag(xml,4,"}",False)
wrt.write_close_tag(xml,3,"}",(row < group_members.rowcount)) wrt.write_close_tag(xml,3,"}",(row < group_members.rowcount))
...@@ -98,13 +98,13 @@ def write_groupfiles_subsection (db, xml, group_guid): ...@@ -98,13 +98,13 @@ def write_groupfiles_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",file_link,",") wrt.write_tag(xml,4,"link",file_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -146,12 +146,12 @@ def write_groupforumtopics_subsection (db, xml, group_guid): ...@@ -146,12 +146,12 @@ def write_groupforumtopics_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"texto",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"texto",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -196,13 +196,13 @@ def write_groupbookmarks_subsection (db, xml, group_guid): ...@@ -196,13 +196,13 @@ def write_groupbookmarks_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",bookmark_link,",") wrt.write_tag(xml,4,"link",bookmark_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -244,12 +244,12 @@ def write_grouppages_subsection (db, xml, group_guid): ...@@ -244,12 +244,12 @@ def write_grouppages_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"texto",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"texto",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -294,13 +294,13 @@ def write_groupvideos_subsection (db, xml, group_guid): ...@@ -294,13 +294,13 @@ def write_groupvideos_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",video_link,",") wrt.write_tag(xml,4,"link",video_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -360,18 +360,18 @@ def write_groupevents_subsection (db, xml, group_guid): ...@@ -360,18 +360,18 @@ def write_groupevents_subsection (db, xml, group_guid):
wrt.write_open_tag(xml,4,"autor","{") wrt.write_open_tag(xml,4,"autor","{")
wrt.write_tag(xml,5,"uid",owner_attr,",") wrt.write_tag(xml,5,"uid",owner_attr,",")
wrt.write_tag(xml,5,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,5,"nome",owner_name,"")
wrt.write_close_tag(xml,4,"}",True) wrt.write_close_tag(xml,4,"}",True)
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"organizador",wrt.substbadc(organizer),",") wrt.write_tag(xml,4,"organizador",organizer,",")
wrt.write_tag(xml,4,"contato",wrt.substbadc(contact),",") wrt.write_tag(xml,4,"contato",contact,",")
wrt.write_tag(xml,4,"endereco",wrt.substbadc(venue),",") wrt.write_tag(xml,4,"endereco",venue,",")
wrt.write_tag(xml,4,"data_inicio",wrt.datestr(time_start),",") wrt.write_tag(xml,4,"data_inicio",wrt.datestr(time_start),",")
wrt.write_tag(xml,4,"data_fim",wrt.datestr(time_end),",") wrt.write_tag(xml,4,"data_fim",wrt.datestr(time_end),",")
wrt.write_tag(xml,4,"taxa_participacao",wrt.substbadc(fees),",") wrt.write_tag(xml,4,"taxa_participacao",fees,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -414,19 +414,19 @@ def write_groups_section(db, xml_file): ...@@ -414,19 +414,19 @@ def write_groups_section(db, xml_file):
wrt.write_open_tag(xml,2,"proprietario","{") wrt.write_open_tag(xml,2,"proprietario","{")
wrt.write_tag(xml,3,"uid",owner_attr,",") wrt.write_tag(xml,3,"uid",owner_attr,",")
wrt.write_tag(xml,3,"nome",wrt.substbadc(owner_name),"") wrt.write_tag(xml,3,"nome",owner_name,"")
wrt.write_close_tag(xml,2,"}",True) wrt.write_close_tag(xml,2,"}",True)
wrt.write_tag(xml,2,"titulo",wrt.substbadc(title),",") wrt.write_tag(xml,2,"titulo",title,",")
wrt.write_tag(xml,2,"data",wrt.datestr(time),",") wrt.write_tag(xml,2,"data",wrt.datestr(time),",")
wrt.write_tag(xml,2,"descricao",wrt.encb64(desc),",") wrt.write_tag(xml,2,"descricao",desc,",")
if wrt.groupaccess_permission(db, guid) == 'public': if wrt.groupaccess_permission(db, guid) == 'public':
comma="," comma=","
else: else:
comma="" comma=""
wrt.write_tag(xml,2,"breve_descricao",wrt.encb64(brief_desc),comma) wrt.write_tag(xml,2,"breve_descricao",brief_desc,comma)
if wrt.groupaccess_permission(db, guid) == 'public': if wrt.groupaccess_permission(db, guid) == 'public':
......
...@@ -50,7 +50,7 @@ def write_userfriends_subsection (db, xml, user_guid): ...@@ -50,7 +50,7 @@ def write_userfriends_subsection (db, xml, user_guid):
friend_attr=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,"uid",friend_attr,",")
wrt.write_tag(xml,4,"usuario",wrt.substbadc(friend_name),"") wrt.write_tag(xml,4,"usuario",friend_name,"")
wrt.write_close_tag(xml,3,"}",(row < friends_info.rowcount)) wrt.write_close_tag(xml,3,"}",(row < friends_info.rowcount))
...@@ -78,7 +78,7 @@ def write_userowngroup_subsection (db, xml, user_guid): ...@@ -78,7 +78,7 @@ def write_userowngroup_subsection (db, xml, user_guid):
group_attr=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,"cid",group_attr,",")
wrt.write_tag(xml,5,"titulo",wrt.substbadc(group_title),"") wrt.write_tag(xml,5,"titulo",group_title,"")
wrt.write_close_tag(xml,4,"}",(row < user_owngroups.rowcount)) wrt.write_close_tag(xml,4,"}",(row < user_owngroups.rowcount))
...@@ -106,7 +106,7 @@ def write_usermembergroup_subsection (db, xml, user_guid): ...@@ -106,7 +106,7 @@ def write_usermembergroup_subsection (db, xml, user_guid):
group_attr=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,"cid",group_attr,",")
wrt.write_tag(xml,5,"titulo",wrt.substbadc(group_title),"") wrt.write_tag(xml,5,"titulo",group_title,"")
wrt.write_close_tag(xml,4,"}",(row < user_membergroups.rowcount)) wrt.write_close_tag(xml,4,"}",(row < user_membergroups.rowcount))
...@@ -147,10 +147,10 @@ def write_userfiles_subsection (db, xml, user_guid): ...@@ -147,10 +147,10 @@ def write_userfiles_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",file_link,",") wrt.write_tag(xml,4,"link",file_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -186,10 +186,10 @@ def write_userblogs_subsection (db, xml, user_guid): ...@@ -186,10 +186,10 @@ def write_userblogs_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"resumo",wrt.encb64(post_excerpt),",") wrt.write_tag(xml,4,"resumo",post_excerpt,",")
wrt.write_tag(xml,4,"texto",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"texto",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -223,10 +223,10 @@ def write_userbookmarks_subsection (db, xml, user_guid): ...@@ -223,10 +223,10 @@ def write_userbookmarks_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",bookmark_link,",") wrt.write_tag(xml,4,"link",bookmark_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -258,9 +258,9 @@ def write_userpages_subsection (db, xml, user_guid): ...@@ -258,9 +258,9 @@ def write_userpages_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"texto",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"texto",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -295,10 +295,10 @@ def write_uservideos_subsection (db, xml, user_guid): ...@@ -295,10 +295,10 @@ def write_uservideos_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"link",video_link,",") wrt.write_tag(xml,4,"link",video_link,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -349,15 +349,15 @@ def write_userevents_subsection (db, xml, user_guid): ...@@ -349,15 +349,15 @@ def write_userevents_subsection (db, xml, user_guid):
wrt.write_open_tag(xml,3,"","{") wrt.write_open_tag(xml,3,"","{")
wrt.write_tag(xml,4,"pid",post_attr,",") wrt.write_tag(xml,4,"pid",post_attr,",")
wrt.write_tag(xml,4,"titulo",wrt.substbadc(post_title),",") wrt.write_tag(xml,4,"titulo",post_title,",")
wrt.write_tag(xml,4,"data",wrt.datestr(time),",") wrt.write_tag(xml,4,"data",wrt.datestr(time),",")
wrt.write_tag(xml,4,"organizador",wrt.substbadc(organizer),",") wrt.write_tag(xml,4,"organizador",organizer,",")
wrt.write_tag(xml,4,"contato",wrt.substbadc(contact),",") wrt.write_tag(xml,4,"contato",contact,",")
wrt.write_tag(xml,4,"endereco",wrt.substbadc(venue),",") wrt.write_tag(xml,4,"endereco",venue,",")
wrt.write_tag(xml,4,"data_inicio",wrt.datestr(time_start),",") wrt.write_tag(xml,4,"data_inicio",time_start,",")
wrt.write_tag(xml,4,"data_fim",wrt.datestr(time_end),",") wrt.write_tag(xml,4,"data_fim",time_end,",")
wrt.write_tag(xml,4,"taxa_participacao",wrt.substbadc(fees),",") wrt.write_tag(xml,4,"taxa_participacao",fees,",")
wrt.write_tag(xml,4,"descricao",wrt.encb64(post_desc),",") wrt.write_tag(xml,4,"descricao",post_desc,",")
wrt.write_comments(db,xml,post_guid) wrt.write_comments(db,xml,post_guid)
...@@ -392,7 +392,7 @@ def write_users_section (db, xml_file): ...@@ -392,7 +392,7 @@ def write_users_section (db, xml_file):
# Write all user's information # Write all user's information
wrt.write_tag(xml,2,"uid",user_attr,",") wrt.write_tag(xml,2,"uid",user_attr,",")
wrt.write_tag(xml,2,"nome",wrt.substbadc(name),",") wrt.write_tag(xml,2,"nome",name,",")
# Write a list of user friend's names # Write a list of user friend's names
write_userfriends_subsection(db, xml, guid) write_userfriends_subsection(db, xml, guid)
......
...@@ -56,15 +56,11 @@ def substbadc (string): ...@@ -56,15 +56,11 @@ def substbadc (string):
string = string.replace('\\','\\\\') string = string.replace('\\','\\\\')
string = string.replace('"','\\"') string = string.replace('"','\\"')
string = string.replace('\t',' ') string = string.replace('\t',' ')
string = string.replace('\n',' ')
string = string.replace('\r',' ')
return string return string
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
#--------------------------------------------------------------------#
def encb64 (string):
encoded_string = base64.standard_b64encode(string.encode('utf-8'))
return encoded_string
#--------------------------------------------------------------------#
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
def cdata (string): def cdata (string):
cdata_string="<![CDATA["+string+"]]>" cdata_string="<![CDATA["+string+"]]>"
...@@ -193,7 +189,7 @@ def write_close_tag (xml, l, sep, comma_flag): ...@@ -193,7 +189,7 @@ def write_close_tag (xml, l, sep, comma_flag):
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
def write_tag (xml, l, tag_name, info_str, comma): def write_tag (xml, l, tag_name, info_str, comma):
name="\""+tag_name+"\"" name="\""+tag_name+"\""
info="\""+info_str+"\"" info="\""+substbadc(info_str)+"\""
xml.write(lvl(l)+name+":"+info+comma+"\n") xml.write(lvl(l)+name+":"+info+comma+"\n")
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
...@@ -217,11 +213,11 @@ def write_comments (db, xml, post_guid): ...@@ -217,11 +213,11 @@ def write_comments (db, xml, post_guid):
write_open_tag(xml,6,"usuario","{") write_open_tag(xml,6,"usuario","{")
write_tag(xml,7,"uid",user_attr,",") write_tag(xml,7,"uid",user_attr,",")
write_tag(xml,7,"nome",substbadc(user_name),"") write_tag(xml,7,"nome",user_name,"")
write_close_tag(xml,6,"}",True) write_close_tag(xml,6,"}",True)
write_tag(xml,6,"data",datestr(time),",") write_tag(xml,6,"data",datestr(time),",")
write_tag(xml,6,"mensagem",encb64(string),"") write_tag(xml,6,"mensagem",string,"")
write_close_tag(xml,5,"}",(row < post_comments.rowcount)) write_close_tag(xml,5,"}",(row < post_comments.rowcount))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment