Changeset 360

Timestamp:

07/09/09 19:01:46 (4 years ago)

Author:

brent

Message:

Added code to handle views that are not html based.

Location:

enpraxis.staticsite/trunk/enpraxis/staticsite

Files:

• browser/controlpanel.py (modified) (3 diffs)
• profiles/default/propertiestool.xml (modified) (1 diff)
• utilities/staticsiteutility.py (modified) (7 diffs)

enpraxis.staticsite/trunk/enpraxis/staticsite/browser/controlpanel.py

@@ -62 +62 @@
                         value_type=TextLine(),)
     
-
+    non_html_views = List(title=_(u'Non HTML Views'),
+                          description=_(u'Views that are included but not based on HTML.'),
+                          required=True,
+                          value_type=TextLine(),)
 
 class StaticSiteControlPanelAdapter(SchemaAdapterBase):
@@ -135 +138 @@
         self.ssprops.views_to_add = views
 
+    def get_non_html_views(self):
+        return self.ssprops.non_html_views
+
+    def set_non_html_views(self, views):
+        self.ssprops.non_html_views = views
+
     deployment_path = property(get_deployment_path, set_deployment_path)
     deployment_url = property(get_deployment_url, set_deployment_url)    
@@ -145 +154 @@
     sections_to_ignore = property(get_sections_to_ignore, set_sections_to_ignore)
     views_to_add = property(get_views_to_add, set_views_to_add)
-        
+    non_html_views = property(get_non_html_views, set_non_html_views)
 
 class StaticSiteControlPanel(ControlPanelForm):

enpraxis.staticsite/trunk/enpraxis/staticsite/profiles/default/propertiestool.xml

@@ -60 +60 @@
       <element value="sitemap" />
       <element value="presentation_view" />
+      <element value="rss" />
     </property> 
+    <property name="non_html_views" type="lines">
+      <element value="rss" />
+    </property>
   </object>
 </object>

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

@@ -224 +224 @@
                             upath = urlparse(link['href'])
                             p = upath[2].split('/')
+                            obj = p[:-1]
+                            view = p[-1]
                             # If we are going to add the action, process it
-                            if p[-1] in ssprops.getProperty('views_to_add'):
+                            if view in ssprops.getProperty('views_to_add'):
                                 mpath = self._getObjPath(url, portal.portal_url(), dpath)
                                 mpath = os.path.split(mpath)
@@ -231 +233 @@
                                 asoup = BeautifulSoup(raw)
                                 body = self.runDocumentFilters(portal, current, asoup, ssprops)
-                                q = p[:-1]
-                                results = portal.portal_catalog.searchResults(query={'path':'/'.join(q[:-1]),}, id=q[-1])
+                                results = portal.portal_catalog.searchResults(
+                                    query={'path':'/'.join(obj[:-1]),},
+                                    id=obj[-1])
                                 if results:
                                     if results[0].is_folderish:
-                                        mpath = '%s/index-%s.html' %(mpath[0], mpath[1])
+                                        mpath = '%s/index-%s' %(mpath[0], mpath[1])
                                     else:
-                                        mpath = '%s-%s.html' %(mpath[0], mpath[1])
+                                        mpath = '%s-%s' %(mpath[0], mpath[1])
+                                    if  view not in ssprops.getProperty('non_html_views'):
+                                        mpath += '.html'
                                     self._writeFile(mpath, body)
 
-    def runViewFilters(self, id, portal, current, soup, ssprops):
-        self.filterIgnoredSections(soup, ssprops)
-        self.filterIgnoredActions(soup, ssprops)
-        self.filterCSSLinks(soup, current)
-        links = self.getDocumentLinks(soup)
-        for x in links:
-            orig = x['href']
-            x['href'] = self.filterDocumentLink(x['href'],
-                                                current,
-                                                portal,
-                                                ssprops.getProperty('views_to_add'))
-            print '   (view-%s) %s => %s' %(id, orig, x['href'])
-        return soup.prettify()
-
-    def filterViewLink(self, link, current, views):
-        lnk = link
-        lnk = self._convertLinkToAbsolute(lnk, current)
-        lnk = self._convertViewLink(lnk, views)
-        lnk = self._convertLinkToRelative(lnk, current)
-        return lnk
-
-    def _convertViewLink(self, link, views):
-        result = link
-        url = urlparse(link)
-        path = url[2].split('/')
-        if path[-1] in views:
-            if len(path) > 1:
-                path[-2] += '-%s.html' %path[-1]
-                path = path[:-1]
-                result = urlunparse((url[0], url[1], '/'.join(path), url[3], url[4], url[5]))
-        return result
-    
     def runDocumentFilters(self, portal, current, soup, ssprops):
         self.filterBaseTag(soup, current)
@@ -289 +262 @@
                                                 current,
                                                 portal,
-                                                ssprops.getProperty('views_to_add'))
+                                                ssprops.getProperty('views_to_add'),
+                                                ssprops.getProperty('non_html_views'))
             print '   %s => %s' %(orig, x['href'])
 
@@ -393 +367 @@
             link['href'] = link['href'].replace(url, nurl)
         
+    def filterImageFullscreenBackLink(self, soup, current):
+        if 'image_view_fullscreen' in current:
+            back = soup.find('a')
+            if back:
+                lt = back.find('span')
+                if lt:
+                    lt.contents[0].replaceWith('Back to Image')
+                if back.has_key('href'):
+                    back['href'] = current.replace('image_view_fullscreen.html', 'view.html')
     def getDocumentLinks(self, soup):
         tags = soup.findAll('a') + soup.findAll('link')
@@ -403 +386 @@
         return links
 
-    def filterImageFullscreenBackLink(self, soup, current):
-        if 'image_view_fullscreen' in current:
-            back = soup.find('a')
-            if back:
-                lt = back.find('span')
-                if lt:
-                    lt.contents[0].replaceWith('Back to Image')
-                if back.has_key('href'):
-                    back['href'] = current.replace('image_view_fullscreen.html', 'view.html')
-
-
-    def filterDocumentLink(self, link, current, portal, views):        
+    def filterDocumentLink(self, link, current, portal, views, nviews):        
         lnk = link
         url = urlparse(lnk)
         if url[2] and 'javascript' != url[0]:
             lnk = self._convertLinkToAbsolute(lnk, current)
-            lnk = self._convertObjectLink(lnk, portal, views)
+            lnk = self._convertObjectLink(lnk, portal, views, nviews)
             lnk = self._convertLinkToRelative(lnk, current)
         return lnk
@@ -441 +413 @@
         return result
 
-    def _convertObjectLink(self, link, portal, views):
+    def _convertObjectLink(self, link, portal, views, nviews):
         # This only works for absolute links
         result = link
@@ -457 +429 @@
                 if results[0].is_folderish:
                     if view:
-                        path = '/'.join(h) + '/index' + '-%s.html' %view
+                        path = '/'.join(h) + '/index' + '-%s' %view
                     else:
                         path = '/'.join(h) + '/index.html'
                 else:
                     if view:
-                        path = '/'.join(h) + '-%s.html' %view
+                        path = '/'.join(h) + '-%s' %view
                     elif h:
                         path = '/'.join(h)
                         if 'Page' == results[0].Type and '.htm' not in path:
                             path += '.html'
+                if view and view not in nviews:
+                    path += '.html'
                 result = urlunparse((hr[0], hr[1], path, hr[3], hr[4], hr[5]))
             elif link == portal.portal_url():