Changeset 761

Timestamp:

05/02/11 14:17:29 (2 years ago)

Author:

brent

Message:

Fixed several bugs and issues with link rewriting.

Location:

3.2/enpraxis.staticsite/tags/1.0-rc2

Files:

• enpraxis.staticsite.egg-info/PKG-INFO (modified) (1 diff)
• enpraxis.staticsite.egg-info/SOURCES.txt (modified) (6 diffs)
• enpraxis/staticsite/utilities/staticsiteutility.py (modified) (17 diffs)

3.2/enpraxis.staticsite/tags/1.0-rc2/enpraxis.staticsite.egg-info/PKG-INFO

@@ -1 +1 @@
 Metadata-Version: 1.0
 Name: enpraxis.staticsite
-Version: 1.0dev-r537
+Version: 1.0-rc2dev-r552
 Summary: Create a static web site from your plone instance.
 Home-page: http://svn.plone.org/svn/plone/plone.example

3.2/enpraxis.staticsite/tags/1.0-rc2/enpraxis.staticsite.egg-info/SOURCES.txt

@@ -42 +42 @@
 enpraxis/staticsite/i18n/plone-ar.po
 enpraxis/staticsite/i18n/plone-bn.po
-enpraxis/staticsite/i18n/plone-br-pt.po
 enpraxis/staticsite/i18n/plone-ca.po
 enpraxis/staticsite/i18n/plone-de.po
@@ -49 +48 @@
 enpraxis/staticsite/i18n/plone-fr.po
 enpraxis/staticsite/i18n/plone-hi.po
+enpraxis/staticsite/i18n/plone-hu.po
 enpraxis/staticsite/i18n/plone-it.po
 enpraxis/staticsite/i18n/plone-ja.po
@@ -54 +54 @@
 enpraxis/staticsite/i18n/plone-ne.po
 enpraxis/staticsite/i18n/plone-nl.po
+enpraxis/staticsite/i18n/plone-pt-br.po
 enpraxis/staticsite/i18n/plone-pt.po
 enpraxis/staticsite/i18n/plone-ru.po
@@ -70 +71 @@
 enpraxis/staticsite/locales/bn/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/bn/LC_MESSAGES/staticsite.po
-enpraxis/staticsite/locales/br-pt/LC_MESSAGES/staticsite.mo
-enpraxis/staticsite/locales/br-pt/LC_MESSAGES/staticsite.po
 enpraxis/staticsite/locales/ca/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/ca/LC_MESSAGES/staticsite.po
@@ -84 +83 @@
 enpraxis/staticsite/locales/hi/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/hi/LC_MESSAGES/staticsite.po
+enpraxis/staticsite/locales/hu/LC_MESSAGES/staticsite.mo
+enpraxis/staticsite/locales/hu/LC_MESSAGES/staticsite.po
 enpraxis/staticsite/locales/it/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/it/LC_MESSAGES/staticsite.po
@@ -94 +95 @@
 enpraxis/staticsite/locales/nl/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/nl/LC_MESSAGES/staticsite.po
+enpraxis/staticsite/locales/pt-br/LC_MESSAGES/staticsite.mo
+enpraxis/staticsite/locales/pt-br/LC_MESSAGES/staticsite.po
 enpraxis/staticsite/locales/pt/LC_MESSAGES/staticsite.mo
 enpraxis/staticsite/locales/pt/LC_MESSAGES/staticsite.po

3.2/enpraxis.staticsite/tags/1.0-rc2/enpraxis/staticsite/utilities/staticsiteutility.py

@@ -30 +30 @@
 from os.path import split as os_split
 
-from urllib2 import urlopen
+from urllib2 import urlopen, unquote
 from urllib2 import HTTPError
 from urlparse import urlparse, urlunparse
@@ -162 +162 @@
         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:
@@ -176 +176 @@
             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
@@ -182 +182 @@
                 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)
 
@@ -215 +215 @@
             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 @@
         else:
             f = open(fn, 'w')
-        f.write(data)
+        try:
+            f.write(data)
+        except TypeError, e:
+            pass
         f.close()
     
@@ -237 +240 @@
         self.deployDocumentActions(portal, aurl, dpath, soup, ssprops)
         self.deployPresentationView(portal, aurl, dpath, soup, ssprops)        
-        self.deployNonActionNonHTMLViews(portal, aurl, dpath, soup, ssprops)
+        self.deployNonActionNonHTMLViews(portal, url, aurl, dpath, soup, ssprops)
         if isFolderish:
             curl = aurl + '/index.html'
@@ -267 +270 @@
                 body = self.runDocumentFilters(portal, current, asoup, ssprops)
                 results = portal.portal_catalog.searchResults(
-                    query={'path':'/'.join(obj[:-1]),},
+                    path={'query':'/'.join(obj[:-1]),},
                     id=obj[-1])
                 if results:
@@ -307 +310 @@
                                 body = self.runDocumentFilters(portal, current, asoup, ssprops)
                                 results = portal.portal_catalog.searchResults(
-                                    query={'path':'/'.join(obj[:-1]),},
+                                    path={'query':'/'.join(obj[:-1]),},
                                     id=obj[-1])
                                 if results:
@@ -318 +321 @@
                                     self._writeFile(mpath, body)
 
-    def deployNonActionNonHTMLViews(self, portal, aurl, dpath, soup, ssprops):
+    def deployNonActionNonHTMLViews(self, portal, ourl, aurl, dpath, soup, ssprops):
         #deploy non-html views that are not tied to views_to_add and not found as links within pages
         views_to_add = ssprops.getProperty('views_to_add')
@@ -325 +328 @@
         for view in views:
             if view == 'rdf':
-                url = '%s/%s' % (aurl, view)
+                url = '%s/%s' % (ourl, view)
                 raw = self._httpget(url)
                 if len(raw) > 0:
@@ -347 +350 @@
         self.filterS5BaseUrl(soup, current)        
         self.filterBaseFilesLinks(soup, current, portal, ssprops)
+        self.filterPortalLogo(soup)
         self.filterImageFullscreenBackLink(soup, current)
         self.filterCSSValidatorLink(soup, current, portal, ssprops)
@@ -357 +361 @@
                                                 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)
@@ -492 +496 @@
                 for tag in tags:
                     if portal_url in tag['src'] or len(tag['src'].split('/')) == 1:
-                        abs_link = self._convertLinkToAbsolute(tag['src'], portal_url)                    
-                        rel_link = self._convertLinkToRelative(abs_link, current)                    
+                        abs_link = self._convertLinkToAbsolute(tag['src'], portal_url + '/index.html')                    
+                        rel_link = self._convertLinkToRelative(abs_link, current) 
+                        tag['src'] = rel_link.replace(x, 'images/%s' %x)                   
                     else:
                         rel_link = tag['src']
-                    tag['src']  = rel_link.replace(x, 'images/%s' % x)
+                    #tag['src']  = rel_link.replace(x, 'images/%s' % x)
+
+    def filterPortalLogo(self, soup):
+        tags = soup.findAll('a', {'id':'portal-logo'})
+        for tag in tags:
+            tag['href'] = '/'
+            img = tag('img')
+            if img:
+                img_name = img[0]['src']
+                if img_name:
+                    img_name = img_name.split('/')[-1]
+                    img[0]['src'] = '/images/%s' %(img_name)
 
     def getDocumentLinks(self, soup):
@@ -522 +538 @@
         hr = urlparse(link)
         if not hr[0] and not hr[1]:
-            cp = c[2].split('/')
+            cp = c[2].split('/')[:-1]
             hp = hr[2].split('/')
             p = []
@@ -546 +562 @@
                 view = h[-1]
                 h = h[:-1]
-            results = portal.portal_catalog.searchResults(query={'path':'/'.join(h),}, id=h[-1])
+            results = portal.portal_catalog.searchResults(path={'query':'/'.join(h),}, id=h[-1])
             if results:
                 path = ''
@@ -589 +605 @@
     def filterPortalUrl(self, data, current):
         """ Blanket filter to replace any remaining portal urls in the page. """
-        return data.replace(current, '')
+        try:
+            return data.replace(current, '')
+        except UnicodeDecodeError,e:
+            pass