[Rapier-commits] r194 - trunk/src

[This list send mail when a change occurs on the subversion repository]

Author: pamadio
Date: 2008-01-17 22:45:28 +0200 (Thu, 17 Jan 2008)
New Revision: 194

Modified:
   trunk/src/swordutils.py
Log:
downloading strong dictionnary works...

Modified: trunk/src/swordutils.py
===================================================================
--- trunk/src/swordutils.py	2008-01-17 18:42:17 UTC (rev 193)
+++ trunk/src/swordutils.py	2008-01-17 20:45:28 UTC (rev 194)
@@ -178,6 +178,8 @@
 
         self.system_info("Installing %s"%conf_file)
         debug("install_module(self,'%s','%s')"%(dataPath,conf_file))
+
+
         self.mgr=Sword.SWMgr()
         modDirNameReg=re.compile("^.*/(\w+)/?\s*$")
         if modDirNameReg.search(dataPath):
@@ -185,14 +187,37 @@
             debug("modDirName='%s'"%modDirName)
         else:
             debug("Problem finding a directory for: %s"%dataPath)
+
+
         
         #local_data_path=self.mgr.globalConfPath
 
         remote_conf=self.rep_location+"/mods.d/"+conf_file
         remote_conf_uri=gnomevfs.URI(remote_conf)
+
         remote_mod=self.rep_location+"/"+dataPath
+        """
+        I dont know why, but the dataPath set in the mods.s/kjv is not
+        exactly the same as with a dictionary book. With the dictionnary
+        the name of the module appears twice:
+
+        DataPath=./modules/lexdict/rawld/strongsgreek/strongsgreek
+        compare with
+        DataPath=./modules/texts/ztext/kjv/
+
+        In case of dictionnary, lets remove the last stuff...
+        
+        """
+        if modDirName=='strongsgreek':
+            remote_mod=self.rep_location+"/modules/lexdict/rawld/strongsgreek"
+        if modDirName=="strongshebrew":
+            remote_mod=self.rep_location+"/modules/lexdict/rawld/strongshebrew"
+            
         remote_mod_uri=gnomevfs.URI(remote_mod)
 
+
+        
+
         tmp_conf=self.tmpDir+"/"+conf_file
         tmp_conf_uri=gnomevfs.URI(tmp_conf)
         tmp_mod=self.tmpDir+"/"+modDirName
@@ -202,6 +227,12 @@
         dst_conf = self.data_path+"/mods.d/"+conf_file
         dst_conf_uri = gnomevfs.URI(dst_conf)
         dst_module = self.data_path+"/"+dataPath
+
+        if modDirName=='strongsgreek':
+            dst_module=self.data_path+"/modules/lexdict/rawld/strongsgreek"
+        if modDirName=="strongshebrew":
+            dst_module=self.data_path+"/modules/lexdict/rawld/strongshebrew"
+        
         dst_module_uri = gnomevfs.URI(dst_module)
 
         #print "dst_conf='%s'"%dst_conf