Changeset 975

Timestamp:

26.04.2010 23:56:32 (2 years ago)

Author:

zmsdev

Message:

Added prototype for epub export-filter.

Location:

ZMS/trunk

Files:

• _filtermanager.py (modified) (5 diffs)
• _mimetypes.py (modified) (2 diffs)
• changes.txt (modified) (1 diff)
• dtml/ZMS/manage_customizefilterform.dtml (modified) (4 diffs)
• import/enum.content_type.xml (modified) (1 diff)
• import/epub.filter.xml (added)
• version.txt (modified) (1 diff)
• www/mime_type.application_epub+zip.gif (added)

ZMS/trunk/_filtermanager.py

@@ -26 +26 @@
 from App.Common import package_home
 from App.special_dtml import HTMLFile
+from Products.ExternalMethod import ExternalMethod
+from Products.PageTemplates import ZopePageTemplate
+from Products.PythonScripts import PythonScript
+from Products.ZSQLMethods import SQL
 import ZPublisher.HTTPRequest
 import copy
@@ -146 +150 @@
 def setProcess(self, newId, newAcquired=0, newName='', newType='process', newCommand=None, zms_system=0):
   if newCommand is None:
-    if newType == 'DTML Method':
-      newCommand = []
-      newCommand.append( '<!-- BO %s -->\n\n'%newId)
-      newCommand.append( '<!-- EO %s -->\n'%newId)
-      newCommand = ''.join( newCommand)
-    else:
-      newCommand = ''
+    newCommand = ''
+    if newType in [ 'DTML Method']:
+      newCommand += '<dtml-comment>--// BO '+ newId + ' //--</dtml-comment>\n'
+      newCommand += '\n'
+      newCommand += '<dtml-comment>--// EO '+ newId + ' //--</dtml-comment>\n'
+    elif newType in [ 'Script (Python)']:
+      newCommand += '# --// BO '+ newId + ' //--\n'
+      newCommand += '# Example code:\n'
+      newCommand += '\n'
+      newCommand += '# Import a standard function, and get the HTML request and response objects.\n'
+      newCommand += 'from Products.PythonScripts.standard import html_quote\n'
+      newCommand += 'request = container.REQUEST\n'
+      newCommand += 'RESPONSE =  request.RESPONSE\n'
+      newCommand += '\n'
+      newCommand += '# Return a string identifying this script.\n'
+      newCommand += 'print "This is the", script.meta_type, \'"%s"\' % script.getId(),\n'
+      newCommand += 'if script.title:\n'
+      newCommand += '    print "(%s)" % html_quote(script.title),\n'
+      newCommand += 'print "in", container.absolute_url()\n'
+      newCommand += 'return printed\n'
+      newCommand += '\n'
+      newCommand += '# --// EO '+ newId + ' //--\n'
   # Set method.
-  if newType == 'DTML Method':
-    container = self.getHome()
-    if newId in container.objectIds([newType]):
-      dtml_method = getattr( container, newId)
-      dtml_method.manage_edit( newName, newCommand)
-    else:
+  container = self.getHome()
+  if newType in [ 'DTML Method']:
+    if newId not in container.objectIds([newType]):
       container.manage_addDTMLMethod( newId, newName, newCommand)
+    newOb = getattr( container, newId)
+    newOb.manage_edit( newName, newCommand)
+    roles=[ 'Manager']
+    newOb._proxy_roles=tuple(roles)
+  elif newType in [ 'Script (Python)']:
+    if newId not in container.objectIds([newType]):
+      PythonScript.manage_addPythonScript( container, newId)
+    newOb = getattr( container, newId)
+    newOb.ZPythonScript_setTitle( newName)
+    newOb.write(newCommand)
+    roles=[ 'Manager']
+    newOb._proxy_roles=tuple(roles)
   # Set.
   obs = getRawProcesses(self)
@@ -188 +216 @@
     if key == id:
       # Delete method.
-      if cp[key].get('type','') == 'DTML Method':
+      if cp[key].get('type','') in [ 'DTML Method', 'External Method', 'Script (Python)']:
         container = self.getHome()
         dtml_method = getattr( container, id, None)
         if dtml_method is not None:
-          container.manage_delObjects( ids = [ id])
+          container.manage_delObjects( ids=[id])
     else:
       obs[key] = cp[key]
@@ -586 +614 @@
           transfilename = '%s/%s'%( folder, trans.getFilename())
           _fileutil.exportObj( trans.getData(), transfilename)
-        if processType == 'DTML Method':
+        if processType in [ 'DTML Method', 'External Method', 'Script (Python)']:
           filename = processMethod(self, processId, filename, trans, REQUEST)
         else:
@@ -646 +674 @@
       # Synchronize type.
       try:
-        if process.get('type') == 'DTML Method':
-          container = self.getHome()
+        container = self.getHome()
+        if process.get('type') in [ 'DTML Method']:
           ob = getattr( container, process['id'])
           process['command'] = ob.raw
+        elif process.get('type') in [ 'Script (Python)']:
+          ob = getattr( container, process['id'])
+          process['command'] = ob.read()
       except:
         pass

ZMS/trunk/_mimetypes.py

@@ -25 +25 @@
 """ Globals. """
 
+application_epub = "mime_type.application_epub+zip.gif"
 application_msaccess = "mime_type.application_msaccess.gif"
 application_mspowerpoint = "mime_type.application_mspowerpoint.gif"
@@ -57 +58 @@
 
 dctMimeType = {
-         'application/mspowerpoint':application_mspowerpoint
+         'application/epub+zip':application_epub
+        ,'application/mspowerpoint':application_mspowerpoint
         ,'application/vnd.ms-access':application_msaccess
         ,'application/vnd.ms-excel':application_x_excel
         ,'application/vnd.ms-powerpoint':application_mspowerpoint
-  ,'application/vnd.openxmlformats-officedocument.wordprocessingml.document':application_docx
-  ,'application/vnd.openxmlformats-officedocument.presentationml.presentation':application_pptx
-  ,'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':application_xlsx
+        ,'application/vnd.openxmlformats-officedocument.wordprocessingml.document':application_docx
+        ,'application/vnd.openxmlformats-officedocument.presentationml.presentation':application_pptx
+        ,'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':application_xlsx
         ,'application/msword':application_msword
         ,'application/octet-stream':application_octet_stream

ZMS/trunk/changes.txt

@@ -1502 +1502 @@
 [974] Added new template-set myZMStheme61 (based on JQuery UI).
 --------------------------------------------------
+2010-04-26:zms2-2.12.1-975
+[975] Added prototype for epub export-filter (@see epub-reader for Firefox http://www.epubread.com/de/).
+--------------------------------------------------

ZMS/trunk/dtml/ZMS/manage_customizefilterform.dtml

@@ -396 +396 @@
              <table cellspacing="1" cellpadding="0" border="0">
              <dtml-let process="getProcess(filterProcess['id'])">
-             <dtml-if "process.get('type','process') == 'DTML Method' or 
+             <dtml-if "process.get('type','process') in ['DTML Method','External Method','Script (Python)'] or 
                        process.get('command','').find('{trans}')>=0">
               <tr>
@@ -792 +792 @@
       <td width="20" rowspan="2"><input class="form-element" type="radio" name="id" value="<dtml-var "process['id']">" onclick="radioOnClick(this,'<dtml-var URL0>');" checked="checked"></td>
       <td>
-       <dtml-if "process.get('type','process') == 'DTML Method'">
-        <img src="/misc_/OFSP/dtmlmethod.gif" title="DTML Method" border="0" align="absmiddle"/>
+       <dtml-if "process.get('type','process') in ['DTML Method','External Method','Script (Python)']">
+        <img src="<dtml-var "getattr(this(),process['id']).icon">" title="<dtml-var "process['type']">" border="0" align="absmiddle"/>
        <dtml-else>
         <img src="<dtml-var MISC_ZMS>process.gif" title="process" border="0" align="absmiddle"/>
@@ -835 +835 @@
        <td class="form-small"><input class="form-element" type="radio" name="id" value="<dtml-var "process['id']">" onclick="radioOnClick(this,'<dtml-var URL0>');"></td>
        <td class="form-small" nowrap="nowrap">
-        <dtml-if "process.get('type','process') == 'DTML Method'">
-         <img src="/misc_/OFSP/dtmlmethod.gif" title="DTML Method" border="0" align="absmiddle"/>
+        <dtml-if "process.get('type','process') in ['DTML Method','External Method','Script (Python)']">
+         <img src="<dtml-var "getattr(this(),process['id']).icon">" title="<dtml-var "process['type']">" border="0" align="absmiddle"/>
         <dtml-else>
          <img src="<dtml-var MISC_ZMS>process.gif" title="process" border="0" align="absmiddle"/>
@@ -890 +890 @@
       <option value="process"><dtml-var "getZMILangStr('ATTR_COMMANDLINE')"></option>
       <option value="DTML Method">DTML Method</option>
+      <option value="Script (Python)">Script (Python)</option>
      </select>
     <tr><td align="right" class="form-small"><dtml-var "getZMILangStr('ATTR_TYPE')"></td></tr>

ZMS/trunk/import/enum.content_type.xml

@@ -5 +5 @@
 <item key="text/html; charset=utf-8">HTML (UTF-8)</item>
 <item key="image/jpeg">JPEG</item>
+<item key="application/epub+zip">Epub</item>
 <item key="application/x-excel">MS Excel</item>
 <item key="application/x-ms-reader">MS Reader</item>

ZMS/trunk/version.txt

@@ -1 @@
-ZMS2 2.12.1-974
+ZMS2 2.12.1-975