Alter option definitions to facilitate installation

Alter option definitions to facilitate installation

participatorio-utils/consultaoffline_src/consultaoffline/lib/opendata_json_class.py

@@ -57,7 +57,7 @@ class OpendataJSON:
 
     #--------------------------------------------------------------------#
     def open_file (self):
-        self.out_file=codecs.open(self.filename,'w',encoding='utf-8')
+        self.out_file=codecs.open(self.dir_results+self.filename,'w',encoding='utf-8')
     #--------------------------------------------------------------------#
 
     #--------------------------------------------------------------------#

participatorio-utils/consultaoffline_src/consultaoffline/opendata_json_version.py

@@ -24,31 +24,46 @@
 import psycopg2
 import datetime
 import shutil
+import os
 
 from lib.json_program_section import write_singlefile_programs_section
 
 def main():
 
+    ######################################################################
+    # OPTIONS:
+
+    # Output directory.
+    # Must be the directory "consultaoffline" located inside of "estacaojuventude" tomcat's webapp
+    #consultaoffline_output_dir="/var/lib/tomcat7/webapps/estacaojuventude/consultaoffline/"
+    consultaoffline_output_dir="/tmp/"
+    # Database options
+    db_host="localhost"
+    db_name="estacaojuventude"
+    db_user="estacaojuventude"
+    db_password="admin"
+
+    ######################################################################
+
     # Filenames definitions
-    consultaoffline_zipfile="/var/lib/tomcat7/webapps/estacaojuventude/consultaoffline/consultaoffline_programas"
-    consultaoffline_rootdir="/home/cadastroweb/consultaoffline_cadastroweb/"
+    consultaoffline_rootdir=os.path.dirname(os.path.realpath(__file__))+"/"
     consultaoffline_basedir="consultaoffline_programas/"
-    consultaoffline_programa_json=consultaoffline_rootdir+consultaoffline_basedir+"programas.json"
+    consultaoffline_filename="programas.json"
 
     # Open connection to database
-    db = psycopg2.connect("host='localhost' dbname='estacaojuventude' user='estacaojuventude'  password='devjuventude'")
+    db = psycopg2.connect("host='"+db_host+"' dbname='"+db_name+"' user='"+db_user+"' password='"+db_password+"'")
 
     # Call functions to write Single Dump JSON file
-    write_singlefile_programs_section(db, consultaoffline_rootdir, consultaoffline_basedir+'programas.json')
+    write_singlefile_programs_section(db, consultaoffline_rootdir+consultaoffline_basedir,consultaoffline_filename)
 
     # Close database connection
     db.close()
 
     # Create Zipfile containing all necessary files to visualize data
-    shutil.make_archive(consultaoffline_zipfile, 'zip', consultaoffline_rootdir, consultaoffline_basedir)
+    shutil.make_archive(consultaoffline_output_dir+"consultaoffline_programas",'zip',\
+        consultaoffline_rootdir, consultaoffline_basedir)
 
     return 0
 
 if __name__ == '__main__':
     main()
-