diff orpg/mapper/miniatures_handler.py @ 11:292e064396e4 traipse_dev

Cleans up the two handlers and removes old code. Should be prod. level now. Build Number.
author sirebral
date Fri, 17 Jul 2009 08:34:18 -0500
parents 73d9286c22cf
children c056e967907a
line wrap: on
line diff
--- a/orpg/mapper/miniatures_handler.py	Fri Jul 17 08:13:50 2009 -0500
+++ b/orpg/mapper/miniatures_handler.py	Fri Jul 17 08:34:18 2009 -0500
@@ -38,6 +38,7 @@
 from grid import GRID_RECTANGLE
 from grid import GRID_HEXAGON
 from grid import GRID_ISOMETRIC
+import os
 
 LABEL_TOOL = wx.NewId()
 LAYER_TOOL = wx.NewId()
@@ -164,9 +165,13 @@
                 min_url = open_rpg.get_component("cherrypy") + filename
             except:
                 return
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles/Textures' or dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles\Textures': min_url = self.settings.get_setting('LocalImageBaseURL') + 'Textures/' + filename
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles/Maps' or dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles\Maps': min_url = self.settings.get_setting('ImageServerBaseURL') + 'Maps/' + filename
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles/Miniatures' or dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles\Miniatures': min_url = self.settings.get_setting('LocalImageBaseURL') + 'Miniatures/' + filename
+            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep +' Textures': 
+                min_url = open_rpg.get_component("cherrypy") + 'Textures/' + filename
+            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Maps': 
+                min_url = open_rpg.get_component("cherrypy") + 'Maps/' + filename
+            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Miniatures': 
+                min_url = open_rpg.get_component("cherrypy") + 'Miniatures/' + filename
+
             # build url
             if min_url == "" or min_url == "http://":
                 return