Changeset 265

Timestamp:

06/04/09 16:47:24 (4 years ago)

Author:

david

Message:

Passing subdomain down to deployObject and updating code to work with deployment_path existing as a property

File:

• enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py (modified) (5 diffs)

enpraxis.staticsite/trunk/enpraxis/staticsite/utilities/staticsiteutility.py

@@ -1 +1 @@
 import Globals
+import httplib
 import os
 
@@ -26 +27 @@
 
         ssprops = context.portal_url.portal_properties.staticsite_properties
+        subdomain = ssprops.getProperty('subdomain')
         rpath = self._getDeploymentPath(ssprops)
         self.createDirectory(rpath)
@@ -36 +38 @@
             review_state='Published')
         for x in brains:
-            self.traverse(x, rpath)
+            self.traverse(x, rpath, subdomain)
 
-    def traverse(self, brain, rpath):
+    def traverse(self, brain, rpath, subdomain):
         """ Traverse the site. """
         brains = brain.portal_catalog.searchResults(
@@ -45 +47 @@
         for x in brains:
             url = x.getURL()
-            self.deployObject(url, x, rpath)
-            if x.isPrincipiaFolderish:
-                self.traverse(x, rpath)
+            self.deployObject(url, x, rpath, subdomain)
+            if x.is_folderish:
+                self.traverse(x, rpath, subdomain)
             
-    def deployObject(self, url, brain, rpath):
+    def deployObject(self, url, brain, rpath, subdomain):
         """ Deploy an object """
+        portal_url = brain.portal_url()    
         if brain.is_folderish:
             #create dir before processing html
-            portal_url = brain.portal_url()
-            folder_path = url.replace(portal_url, self.static_rootpath)
+            folder_path = url.replace(portal_url, rpath)
             self.createDirectory(folder_path)
-        raw = self.httpget(url)        
+        raw = self.httpget(url, portal_url, subdomain)        
         data = self.runFilters(raw, None)
         print url
@@ -64 +66 @@
         return data
     
-    def httpget(self, url):
+    def httpget(self, url, portal_url, subdomain):
+        url = url.replace(portal_url, subdomain)
         return url