team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 421
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Mon 2012-11-05 00:23:52 +0100
message:
  fix configuration & resources paths in Makefile
modified:
  Makefile
  src/alfanous-import/main.py


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription

=== modified file 'Makefile'
--- Makefile	2012-11-04 20:28:20 +0000
+++ Makefile	2012-11-04 23:23:52 +0000
@@ -21,8 +21,9 @@
 ## linguistic resources on the form of python dictionaries		
 DYNAMIC_RESOURCES_PATH=$(API_PATH)"alfanous/dynamic_resources/"
 
-## Alfanous Desktop Gui configuration files, generated by "configobj" module 
-CONFIG_PATH="./resources/configs/"
+## resources & configuration files 
+CONFIGS_PATH=$(API_PATH)"alfanous/configs/"
+RESOURCES_PATH=$(API_PATH)"alfanous/resources/"
 
 ## Databases file, the databases mainly store the Quranic data in a middle 
 ## structure before indexing it  
@@ -139,17 +140,17 @@
 
 # update information manually 
 update_information:
-	nano $(CONFIG_PATH)information.js
+	nano $(RESOURCES_PATH)information.json
 
 # update hints manually
 update_hints:
-	nano $(CONFIG_PATH)hints.js
+	nano $(CONFIGS_PATH)hints.json
 
 # update stats manually, to initiate it just leave it as an empty json object {}
 # never leave it empty till fix that! TODO
 update_stats:
-	nano $(CONFIG_PATH)stats.js 
-	chmod 777 $(CONFIG_PATH)stats.js 
+	nano $(CONFIGS_PATH)stats.json 
+	chmod 777 $(CONFIGS_PATH)stats.json 
 
 # update downloading translation list manually
 update_translations_to_download_list:
@@ -157,7 +158,7 @@
 
 # update list of indexed translations automatically using Importer
 update_translations_indexed_list:
-	export PYTHONPATH=$(API_PATH) ;	python $(QIMPORT) -u translations.js  $(INDEX_PATH)extend/ $(CONFIG_PATH)translations.js
+	export PYTHONPATH=$(API_PATH) ;	python $(QIMPORT) -u translations $(INDEX_PATH)extend/ $(CONFIG_PATH)translations.json
 
 # update quranic corpus in the database automatically using Importer
 update_quranic_corpus:
@@ -169,7 +170,7 @@
 
 # update recitations online list automatically from the project every ayah
 update_recitations_online_list:
-	cd $(CONFIG_PATH); wget http://www.everyayah.com/data/recitations.js
+	cd $(CONFIGS_PATH); wget http://www.everyayah.com/data/recitations.js; mv recitations.js recitations.json
 
 # update dynamic resources automatically , see transfer_prebuild, transfer_postbuild
 update_dynamic_resources_prebuild: transfer_prebuild

=== modified file 'src/alfanous-import/main.py'
--- src/alfanous-import/main.py	2012-09-29 18:06:14 +0000
+++ src/alfanous-import/main.py	2012-11-04 23:23:52 +0000
@@ -51,7 +51,7 @@
 commands.add_option( "-d", "--download", dest = "download", type = "choice", choices = ["tanzil_simple_clean", "tanzil_uthmani"],
                   help = "download Quranic resources", metavar = "FIELD" )
 
-commands.add_option( "-u", "--update", dest = "update", type = "choice", choices = ["translations.js", "wordqc"],
+commands.add_option( "-u", "--update", dest = "update", type = "choice", choices = ["translations", "wordqc"],
                   help = "update store information files", metavar = "FIELD" )
 
 
@@ -165,8 +165,8 @@
 
 
 
-    if options.update == "translations.js":
+    if options.update == "translations":
         update_translations_list( TSE_index = SOURCE, translations_list_file = DESTINATION )
     elif options.update == "wordqc":
-        QCI = QuranicCorpusImporter( SOURCE, DESTINATION )
+	QCI = QuranicCorpusImporter( SOURCE, DESTINATION )