diff --git a/lib/json/group_section.py b/lib/json/group_section.py index 214d8139dd8386ce7ac14c96a4a5e52097a28d7c..187bdebeb700fc6f5d4ea49c0124dbbb22ee06bd 100644 --- a/lib/json/group_section.py +++ b/lib/json/group_section.py @@ -381,8 +381,9 @@ def write_groupevents_subsection (db, json, group_guid): #--------------------------------------------------------------------# #--------------------------------------------------------------------# -def write_groups_section (db, json_filename): +def write_groups_section (db, dir_results): + json_filename=dir_results+wrt.date_today()+"_comunidades"+".json" json = wrt.open_json_file(json_filename) wrt.write_open_tag(json,0,"","{") diff --git a/lib/json/user_section.py b/lib/json/user_section.py index 53286fcf20226950debce6c8d81be742ac7d8d0e..e96987dfd8e0bb474210859f3acae96800d56570 100644 --- a/lib/json/user_section.py +++ b/lib/json/user_section.py @@ -370,8 +370,9 @@ def write_userevents_subsection (db, json, user_guid): #--------------------------------------------------------------------# #--------------------------------------------------------------------# -def write_users_section (db, json_filename): +def write_users_section (db, dir_results): + json_filename=dir_results+wrt.date_today()+"_usuarios"+".json" json = wrt.open_json_file(json_filename) wrt.write_open_tag(json,0,"","{") diff --git a/lib/json/write_support_functions.py b/lib/json/write_support_functions.py index 8af946e6ae4127a0ae466686bca94abc0bbf514b..dbc0566ff96fa0ccc228d2e8d7bda2a59354b6fd 100644 --- a/lib/json/write_support_functions.py +++ b/lib/json/write_support_functions.py @@ -37,6 +37,12 @@ def open_json_file (json_filename): return json_file #--------------------------------------------------------------------# +#--------------------------------------------------------------------# +def date_today(): + date = str(datetime.date.today()) + return date +#--------------------------------------------------------------------# + #--------------------------------------------------------------------# def lvl (l): if l == 1: diff --git a/lib/xml/group_section.py b/lib/xml/group_section.py index bf6a4d14bd10cc927b80b6aef379ce08a343e600..917ef37ff1c11d0fd8b49311a10e16f2e4b48a91 100644 --- a/lib/xml/group_section.py +++ b/lib/xml/group_section.py @@ -300,8 +300,9 @@ def write_groupevents_subsection (db, xml, group_guid): #--------------------------------------------------------------------# #--------------------------------------------------------------------# -def write_groups_section (db, xml_filename): +def write_groups_section (db, dir_results): + xml_filename=dir_results+wrt.date_today()+"_comunidades"+".xml" xml = wrt.open_xml_file(xml_filename) wrt.write_open_tag(xml,0,"comunidades",'') diff --git a/lib/xml/user_section.py b/lib/xml/user_section.py index 1e1d789c895d3684cd16dbbafe6ef847ec024b69..48a702b2faca638cf067b70626cc4e3f28ce7dc1 100644 --- a/lib/xml/user_section.py +++ b/lib/xml/user_section.py @@ -303,8 +303,9 @@ def write_userevents_subsection (db, xml, user_guid): #--------------------------------------------------------------------# #--------------------------------------------------------------------# -def write_users_section (db, xml_filename): +def write_users_section (db, dir_results): + xml_filename=dir_results+wrt.date_today()+"_usuarios"+".xml" xml = wrt.open_xml_file(xml_filename) wrt.write_open_tag(xml,0,"usuarios",'') diff --git a/lib/xml/write_support_functions.py b/lib/xml/write_support_functions.py index 6175f7c3e4609a4de029088785e29d84ac31564a..e3a2e91011ff270467f4c3e5ecff8b9ef51bab87 100644 --- a/lib/xml/write_support_functions.py +++ b/lib/xml/write_support_functions.py @@ -37,6 +37,12 @@ def open_xml_file (xml_filename): return xml_file #--------------------------------------------------------------------# +#--------------------------------------------------------------------# +def date_today(): + date = str(datetime.date.today()) + return date +#--------------------------------------------------------------------# + #--------------------------------------------------------------------# def lvl (l): if l == 1: diff --git a/opendata_json_version.py b/opendata_json_version.py index d9e16a53fff0f69f9241e2d393a1d31cd18f7a96..6768425f767f732a96c79507d64f98800fd5fe43 100644 --- a/opendata_json_version.py +++ b/opendata_json_version.py @@ -37,17 +37,14 @@ def main(): charset='utf8') # Define directory and name of XML files - date_today=str(datetime.date.today()) dir_results="/home/www/elgg/opendata_xmlfiles/" - user_xml_file=dir_results+date_today+"_usuarios"+".json" - group_xml_file=dir_results+date_today+"_comunidades"+".json" # Get the execution start time information time_script_start=datetime.datetime.now() - # Call functions to write XML files - #write_users_section(db,user_xml_file) - write_groups_section(db,group_xml_file) + # Call functions to write JSON files + write_users_section(db,dir_results) + write_groups_section(db,dir_results) # Calculate and Print script time duration script_duration=datetime.datetime.now()-time_script_start diff --git a/opendata_xml_version.py b/opendata_xml_version.py index 415428a6825b66eb3b4a958f163eaa5c0237f3a6..18c434ae335f2f6633714b3ad1d31a3942af3c97 100644 --- a/opendata_xml_version.py +++ b/opendata_xml_version.py @@ -37,17 +37,14 @@ def main(): charset='utf8') # Define directory and name of XML files - date_today=str(datetime.date.today()) dir_results="/home/www/elgg/opendata_xmlfiles/" - user_xml_file=dir_results+date_today+"_usuarios"+".xml" - group_xml_file=dir_results+date_today+"_comunidades"+".xml" - + # Get the execution start time information time_script_start=datetime.datetime.now() # Call functions to write XML files - write_users_section(db,user_xml_file) - write_groups_section(db,group_xml_file) + write_users_section(db,dir_results) + write_groups_section(db,dir_results) # Calculate and Print script time duration script_duration=datetime.datetime.now()-time_script_start