Changeset 529

Timestamp:

08/06/09 16:05:15 (3 years ago)

Author:

david

Message:

adding logic to discover presentation view as it is no longer a document_action

Files:

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

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

@@ -150 +150 @@
         path = self._getObjPath(url, portal.portal_url(), dpath)
         if folderish:
-            print '@@@ '+  url + '/index.html'
+            # print '@@@ '+  url + '/index.html'
             self.processDocument(url, portal, dpath, ssprops, True)
         elif ctype in ['Page']:
             # Fix this so that it deals with the case where you have both a file and a file.html in the
             # same folder
-            print '*** '+  url
+            # print '*** '+  url
             self.processDocument(url, portal, dpath, ssprops)
         else:
@@ -164 +164 @@
             aurl = urlparse(url)
             aurl = urlunparse((aurl[0], aurl[1], aurl[2] + '-view.html', aurl[3], aurl[4], aurl[5]))
-            print 'vvv '+  aurl
+            # print 'vvv '+  aurl
             self.processDocument(url + '/view', portal, dpath, ssprops, alturl=aurl)
             # If it is an image process the fullscreen view
@@ -170 +170 @@
                 aurl = urlparse(url)
                 aurl = urlunparse((aurl[0], aurl[1], aurl[2] + '-image_view_fullscreen.html', aurl[3], aurl[4], aurl[5]))
-                print 'iii '+  aurl
+                # print 'iii '+  aurl
                 self.processDocument(url + '/image_view_fullscreen', portal, dpath, ssprops, alturl=aurl)
 
@@ -203 +203 @@
             return data
         except HTTPError, e:           
-            print '!!! Error : %s %s for url: %s' % (e.code, e.msg, e.filename)
+            # print '!!! Error : %s %s for url: %s' % (e.code, e.msg, e.filename)
             return ''
             
@@ -224 +224 @@
         soup = BeautifulSoup(raw)
         self.deployDocumentActions(portal, aurl, dpath, soup, ssprops)
+        self.deployPresentationView(portal, aurl, dpath, soup, ssprops)                
         self.deployNonActionNonHTMLViews(portal, aurl, dpath, soup, ssprops)
         if isFolderish:
@@ -236 +237 @@
             mpath += '.html'
         self._writeFile(mpath, body)
+
+    def deployPresentationView(self, portal, current, dpath, soup, ssprops):
+        #Look for presentation view
+        raw_pres = soup.find('p', id='link-presentation')
+        if raw_pres:
+            url = raw_pres.a['href']
+            upath = urlparse(url)
+            p = upath[2].split('/')
+            obj = p[:-1]
+            view = p[-1]
+            if view in ssprops.getProperty('views_to_add'):
+                mpath = self._getObjPath(url, portal.portal_url(), dpath)
+                mpath = os.path.split(mpath)
+                raw = self._httpget(url)
+                asoup = BeautifulSoup(raw)
+                body = self.runDocumentFilters(portal, current, asoup, ssprops)
+                results = portal.portal_catalog.searchResults(
+                    query={'path':'/'.join(obj[:-1]),},
+                    id=obj[-1])
+                if results:
+                    if results[0].is_folderish:
+                        mpath = '%s/index-%s' %(mpath[0], mpath[1])
+                    else:
+                        mpath = '%s-%s' %(mpath[0], mpath[1])
+                    if  view not in ssprops.getProperty('non_html_views'):
+                        mpath += '.html'
+                    self._writeFile(mpath, body)            
+
 
     def deployDocumentActions(self, portal, current, dpath, soup, ssprops):
@@ -316 +345 @@
                                                 ssprops.getProperty('views_to_add'),
                                                 ssprops.getProperty('non_html_views'))
-            print '   %s => %s' %(orig, x['href'])
+            # print '   %s => %s' %(orig, x['href'])
         data = soup.prettify()
         return self.filterPortalUrl(data, current)