r252778 - in ARFilePreview/branches/suresh_plone425: . templates

Author: sureshvv
Date: Fri May  9 05:57:48 2014
New Revision: 252778

Modified:
   ARFilePreview/branches/suresh_plone425/adapters.py
   ARFilePreview/branches/suresh_plone425/interfaces.py
   ARFilePreview/branches/suresh_plone425/templates/file_preview.pt
   ARFilePreview/branches/suresh_plone425/views.py
Log:
works

Modified: ARFilePreview/branches/suresh_plone425/adapters.py
==============================================================================
--- ARFilePreview/branches/suresh_plone425/adapters.py	(original)
+++ ARFilePreview/branches/suresh_plone425/adapters.py	Fri May  9 05:57:48 2014
@@ -33,16 +33,17 @@
 import re
 from DateTime import DateTime
 
-from zope.interface import implements
-from zope.component.exceptions import ComponentLookupError
-from zope.app.traversing.adapters import Traverser
-from zope.app.annotation.interfaces import IAnnotations
+from zope.interface import implements, Interface
+from zope.component.interfaces import ComponentLookupError
+from zope.traversing.adapters import Traverser
+from zope.annotation.interfaces import IAnnotations
 
 from BTrees.OOBTree import OOBTree
 from Products.CMFCore.utils import getToolByName
 from Products.ARFilePreview.interfaces import IPreviewable
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.CatalogTool import registerIndexableAttribute
+#from Products.CMFPlone.CatalogTool import registerIndexableAttribute
+from plone.indexer import indexer
 
 class ToPreviewableObject( object ):
     
@@ -60,6 +61,9 @@
             prefix = match.group(1)
             inside = match.group(2)
             postfix = match.group(3)
+
+            pos = inside.rfind('/')
+            inside = inside[pos+1:]
             # patch inside
             if inside.startswith('./'):
                 # some .swt are converted with this prefix
@@ -136,6 +140,7 @@
         self.setPreview(html_converted.decode('utf-8', "replace"))
 	self.context.reindexObject()
 
+@indexer(Interface)
 def previewIndexWrapper(object, portal, **kwargs):
     data = object.SearchableText()
     try:
@@ -146,4 +151,4 @@
         # The catalog expects AttributeErrors when a value can't be found
         return data
 
-registerIndexableAttribute('SearchableText', previewIndexWrapper)
+#registerIndexableAttribute('SearchableText', previewIndexWrapper)

Modified: ARFilePreview/branches/suresh_plone425/interfaces.py
==============================================================================
--- ARFilePreview/branches/suresh_plone425/interfaces.py	(original)
+++ ARFilePreview/branches/suresh_plone425/interfaces.py	Fri May  9 05:57:48 2014
@@ -32,7 +32,7 @@
 
 
 from zope.interface import Interface
-from zope.app.event.interfaces import IObjectModifiedEvent
+from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
 
 class IPreviewAware( Interface ):

Modified: ARFilePreview/branches/suresh_plone425/templates/file_preview.pt
==============================================================================
--- ARFilePreview/branches/suresh_plone425/templates/file_preview.pt	(original)
+++ ARFilePreview/branches/suresh_plone425/templates/file_preview.pt	Fri May  9 05:57:48 2014
@@ -30,7 +30,7 @@
 
         <p>
             <a href=""
-               tal:attributes="href string:${here_url}/at_download/file">
+               tal:attributes="href string:${here/absolute_url}/at_download/file">
                 <img src="" tal:define="icon python:here.getIcon(1)" tal:attributes="src string:${portal_url}/${icon}" alt="" />
                 <tal:block i18n:translate="label_click_to_get_file">
                 Click here to get the file

Modified: ARFilePreview/branches/suresh_plone425/views.py
==============================================================================
--- ARFilePreview/branches/suresh_plone425/views.py	(original)
+++ ARFilePreview/branches/suresh_plone425/views.py	Fri May  9 05:57:48 2014
@@ -103,6 +103,8 @@
         except AttributeError:
             pass
         else:
-            return Wrapper(data, name, mime).__of__(self)
+            return Wrapper(data, name, mime).__of__(self.context)
         return getattr(self, name)
 
+    def publishTraverse(self, request, name):
+        return self.__bobo_traverse__(request, name)

------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
&#149; 3 signs your SCM is hindering your productivity
&#149; Requirements for releasing software faster
&#149; Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce