From 964d40677c3cb1092eed1d9556233671178952d4 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <brunonzanette@gmail.com>
Date: Mon, 16 Sep 2013 17:00:09 -0300
Subject: [PATCH] Move filename's definition away from "main"
Moved filename's definition from "main" function to inside functions that write the files.
Once again, this change was made to simplify the process of writing multiple files.
Signed-off-by: Bruno Nocera Zanette <brunonzanette@gmail.com>
---
lib/json/group_section.py | 3 ++-
lib/json/user_section.py | 3 ++-
lib/json/write_support_functions.py | 6 ++++++
lib/xml/group_section.py | 3 ++-
lib/xml/user_section.py | 3 ++-
lib/xml/write_support_functions.py | 6 ++++++
opendata_json_version.py | 9 +++------
opendata_xml_version.py | 9 +++------
8 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/lib/json/group_section.py b/lib/json/group_section.py
index 214d813..187bdeb 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 53286fc..e96987d 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 8af946e..dbc0566 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 bf6a4d1..917ef37 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 1e1d789..48a702b 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 6175f7c..e3a2e91 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 d9e16a5..6768425 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 415428a..18c434a 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
--
GitLab