Changeset 752

Timestamp:

26.10.2009 17:53:28 (2 years ago)

Author:

chris

Message:

zms-2.11.4-02

Location:

ZMS/trunk

Files:

• ZMSFormatProvider.py (modified) (1 diff)
• ZMSGlobals.py (modified) (1 diff)
• ZMSItem.py (modified) (3 diffs)
• ZMSMetamodelProvider.py (modified) (1 diff)
• __init__.py (modified) (2 diffs)
• _accessmanager.py (modified) (1 diff)
• _cachemanager.py (modified) (2 diffs)
• _confmanager.py (modified) (3 diffs)
• _copysupport.py (modified) (1 diff)
• _deprecatedapi.py (modified) (1 diff)
• _filtermanager.py (modified) (1 diff)
• _ftpmanager.py (modified) (1 diff)
• _globals.py (modified) (4 diffs)
• _importable.py (modified) (1 diff)
• _mediadb.py (modified) (1 diff)
• _metacmdmanager.py (modified) (1 diff)
• _multilangmanager.py (modified) (1 diff)
• _objinputs.py (modified) (1 diff)
• _objtypes.py (modified) (1 diff)
• _sequence.py (modified) (1 diff)
• _versionmanager.py (modified) (1 diff)
• _webdav.py (deleted)
• _workflowmanager.py (modified) (1 diff)
• _zmsattributecontainer.py (modified) (2 diffs)
• _zreferableitem.py (modified) (1 diff)
• changes.txt (modified) (1 diff)
• dtml/ZMSContainerObject/manage_importexportdebugfilter.dtml (modified) (5 diffs)
• dtml/ZMSContainerObject/manage_main_change.dtml (modified) (1 diff)
• dtml/ZMSContainerObject/manage_system.dtml (modified) (1 diff)
• dtml/object/f_breadcrumbs.dtml (modified) (1 diff)
• import/default_win32.filter.xml (modified) (3 diffs)
• version.txt (modified) (1 diff)
• zms.py (modified) (2 diffs)
• zmscontainerobject.py (modified) (4 diffs)
• zmscustom.py (modified) (1 diff)
• zmslinkcontainer.py (modified) (2 diffs)
• zmslinkelement.py (modified) (2 diffs)
• zmslog.py (modified) (1 diff)
• zmsobject.py (modified) (6 diffs)
• zmssqldb.py (modified) (2 diffs)
• zmstrashcan.py (modified) (1 diff)

ZMS/trunk/ZMSFormatProvider.py

@@ -26 +26 @@
 from __future__ import nested_scopes
 from zope.interface import implements
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 # Product Imports.

ZMS/trunk/ZMSGlobals.py

@@ -26 +26 @@
 from AccessControl import AuthEncoding
 from App.Common import package_home
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from DateTime.DateTime import DateTime
 from cStringIO import StringIO

ZMS/trunk/ZMSItem.py

@@ -25 +25 @@
 from __future__ import nested_scopes
 from DateTime.DateTime import DateTime
-from Globals import HTMLFile, Persistent
+from App.special_dtml import HTMLFile
+from Persistence import Persistent
 from Acquisition import Implicit
-from OFS.PropertySheets import PropertySheets, vps
-from webdav.Lockable import ResourceLockedError
-import OFS.SimpleItem, OFS.ObjectManager, webdav.Collection
+import OFS.SimpleItem, OFS.ObjectManager
 import string
-import _webdav
 
 
@@ -43 +41 @@
 class ZMSItem(
         OFS.ObjectManager.ObjectManager,
-        webdav.Collection.Collection,
         OFS.SimpleItem.Item,
         Persistent,                             # Persistent. 
@@ -127 +124 @@
       return RESPONSE.redirect('manage?lang=%s'%lang)
 
-
-    ############################################################################
-    ###
-    ###  WebDAV
-    ###
-    ############################################################################
-
-    # Standard DAVProperties + ZMSProperties.
-    # ---------------------------------------
-    propertysheets=vps(_webdav.ZMSPropertySheets)
-
-
-    # --------------------------------------------------------------------------
-    #  ZMSItem._checkWebDAVLock
-    # --------------------------------------------------------------------------
-    def _checkWebDAVLock(self):
-      if self.wl_isLocked():
-        raise ResourceLockedError, 'This %s Object is locked via WebDAV' % self.meta_type
-
-
-    # --------------------------------------------------------------------------
-    #  ZMSItem.document_src
-    # --------------------------------------------------------------------------
-    def document_src(self, REQUEST={}):
-      """ document_src returns ZMSAttributes as XML """
-      return self.toXml(REQUEST, incl_embedded=False, deep=False, data2hex=True)
-
-
-    manage_FTPget = manage_DAVget = document_src
-
-    # --------------------------------------------------------------------------
-    #  ZMSItem.PUT
-    # --------------------------------------------------------------------------
-    def PUT(self, REQUEST, RESPONSE):
-        """Handle HTTP PUT requests"""
-        self.dav__init(REQUEST, RESPONSE)
-        self.dav__simpleifhandler(REQUEST, RESPONSE, refresh=1)
-        
-        file=REQUEST['BODYFILE']
-        
-        builder = _webdav.XmlWebDAVBuilder()
-        
-        v = builder.parse(file)
-        
-        lang = REQUEST.get('lang', None)
-        
-        if lang is None:
-          lang = self.getPrimaryLanguage()
-          REQUEST.set('lang', lang)
-        
-        if _globals.debug( self):
-          for key in v.keys():
-            _globals.writeLog( self, '%s: %s' %(key, v.get(key, lang)))
-        
-        attrs = self.getObjAttrs()
-        
-        if _globals.debug( self):
-          _globals.writeLog( 'Updating %s via WebDAV' % self.absolute_url())
-        
-        self.setObjStateModified(REQUEST)
-        
-        for attr in attrs.keys():
-          if attr in v.keys():
-            # get new value
-            value_new = v.get(attr, lang)
-            
-            # if value is used as datetime, convert to correct form
-            datatype = attrs[attr].get('datatype', 'string')
-            if datatype == 'datetime':
-                if value_new[0] == '(':
-                    value_new = value_new[1:-1].split(',')
-                    value_new = map(int, value_new)
-                    value_new = _globals.getDateTime(tuple(value_new))
-            
-            # if value is used as boolea, convert to correct form
-            if datatype == 'boolean':
-                value_new = bool(value_new)
-            
-            # get old value
-            value_old = self.getObjProperty(attr, REQUEST)
-            
-            # if value has changed
-            if value_new != value_old:
-              if _globals.debug( self):
-                _globals.writeLog( 'Updating property %s: %s' % (attr, value_new))
-              self.setObjProperty(attr, value_new, forced=1)
-        
-        self.onChangeObj(REQUEST)
-        
-        RESPONSE.setStatus(204)
-        return RESPONSE
-
-
-    # --------------------------------------------------------------------------
-    #  ZMSItem.listDAVObjects
-    # --------------------------------------------------------------------------
-    def listDAVObjects(self):
-      objectValues = getattr(self, 'objectValues', None)
-      if objectValues is not None:
-        spec = [ 'BTreeFolder2',
-                 'DTML Document',
-                 'DTML Method',
-                 'File',
-                 'Folder',
-                 'Folder (Ordered)',
-                 'Image',
-                 'Script (Python)']
-        spec.extend( self.dGlobalAttrs.keys())
-        return objectValues(spec = spec)
-      return []
-
 ################################################################################

ZMS/trunk/ZMSMetamodelProvider.py

@@ -26 +26 @@
 from __future__ import nested_scopes
 from zope.interface import implements
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 # Product Imports.

ZMS/trunk/__init__.py

@@ -31 +31 @@
 
 # Imports.
-from Globals import ImageFile
 from App.Common import package_home
+from App.ImageFile import ImageFile
 import OFS.misc_
 import os
@@ -157 +157 @@
             )
             
-        context.registerBaseClass(zms.ZMS)
         
         # automated registration for util

ZMS/trunk/_accessmanager.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from AccessControl.User import UserFolder
 from types import StringTypes

ZMS/trunk/_cachemanager.py

@@ -304 +304 @@
       """ CacheableObject.manage_getCachedPages """
       
-      self._checkWebDAVLock()
       message = ''
       t0 = time.time()
@@ -332 +331 @@
       """ CacheableObject.manage_clearCachePages """
       
-      self._checkWebDAVLock()
       message = ''
       t0 = time.time()

ZMS/trunk/_confmanager.py

@@ -27 +27 @@
 from cStringIO import StringIO
 from App.Common import package_home
+from App.special_dtml import HTMLFile
 from DateTime.DateTime import DateTime
-from Globals import HTMLFile
 from OFS.CopySupport import absattr
 from OFS.Image import Image
@@ -206 +206 @@
       """
       filenames = {}
-      filepath = package_home(globals())+'/import/'
-      conf = open( filepath+'configure.zcml','r')
+      filepaths = [
+        self.Control_Panel.getINSTANCE_HOME()+'/etc/zms/import/',
+        package_home(globals())+'/import/',]
+      try:
+        conf = open( filepaths[0]+'configure.zcml','r')
+      except:
+        conf = open( filepaths[1]+'configure.zcml','r')
       conf_xml = self.xmlParse( conf)
+      print "conf_xml=",conf_xml
       for source in self.xmlNodeSet(conf_xml,'source'):
         location = source['attrs']['location']
+        print "location=",location
         if location.startswith('http://'):
           try:
@@ -222 +229 @@
             _globals.writeError( self, "[getConfFiles]: can't get conf-files from remote URL=%s"%location)
         else:
-          for filename in os.listdir(filepath+location):
-            path = filepath + filename
-            mode = os.stat(path)[stat.ST_MODE]
-            if not stat.S_ISDIR(mode):
-              if filename not in filenames:
-                filenames[path] = filename
+          for filepath in filepaths:
+            for filename in os.listdir(filepath+location):
+              path = filepath + filename
+              mode = os.stat(path)[stat.ST_MODE]
+              if not stat.S_ISDIR(mode):
+                if filename not in filenames:
+                  filenames[path] = filename
       conf.close()
       # Filter.

ZMS/trunk/_copysupport.py

@@ -267 +267 @@
       t0 = time.time()
       
-      # Check if object is locked via WebDAV
-      self._checkWebDAVLock()
-      
       # Analyze request
       cp=self._get_cb_copy_data(cb_copy_data=None,REQUEST=REQUEST)

ZMS/trunk/_deprecatedapi.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 # Product Imports.
 import _globals

ZMS/trunk/_filtermanager.py

@@ -25 +25 @@
 from __future__ import nested_scopes
 from App.Common import package_home
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import ZPublisher.HTTPRequest
 import copy

ZMS/trunk/_ftpmanager.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import urllib
 import ftplib

ZMS/trunk/_globals.py

@@ -540 +540 @@
 ################################################################################
 #
-#  Traces
+#  Logging
 #
 ################################################################################
 """
+
+LOG = logging.getLogger("ZMS")
 
 # ------------------------------------------------------------------------------
@@ -565 +567 @@
 def writeLog(self, info):
   try:
+    LOG.debug(info)
     zms_log = getattr( self, 'zms_log', None)
     if 'DEBUG' in zms_log.logged_entries:
@@ -578 +581 @@
 def writeBlock(self, info):
   try:
+    LOG.info(info)
     zms_log = getattr( self, 'zms_log', None)
     if 'INFO' in zms_log.logged_entries:
@@ -592 +596 @@
   info = '?'
   try:
+    LOG.error(info)
     t,v,tb = sys.exc_info()
     v = str(v)

ZMS/trunk/_importable.py

@@ -24 +24 @@
 # Imports.
 from App.Common import package_home
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import ZPublisher.HTTPRequest
 import os

ZMS/trunk/_mediadb.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile, Persistent
+from App.special_dtml import HTMLFile
+from Persistence import Persistent
 from ZPublisher.Iterators import filestream_iterator
 import OFS.SimpleItem

ZMS/trunk/_metacmdmanager.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from Products.PythonScripts import PythonScript
 import copy

ZMS/trunk/_multilangmanager.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 import urllib

ZMS/trunk/_objinputs.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 # Product Imports.
 import _globals

ZMS/trunk/_objtypes.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 # Product Imports.
 import _fileutil

ZMS/trunk/_sequence.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import urllib
 # Product Imports.

ZMS/trunk/_versionmanager.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 import operator

ZMS/trunk/_workflowmanager.py

@@ -25 +25 @@
 from __future__ import nested_scopes
 from App.Common import package_home
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import ZPublisher.HTTPRequest
 import copy

ZMS/trunk/_zmsattributecontainer.py

@@ -28 +28 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from OFS.Folder import Folder
-from webdav.Resource import Resource
-from webdav.Lockable import ResourceLockedError
-from webdav.WriteLockInterface import WriteLockInterface
 import urllib
 import time
@@ -156 +153 @@
     return RESPONSE.redirect('manage_propertiesForm?manage_tabs_message=%s'%(urllib.quote(message)))
 
-
-  """
-  ##############################################################################
-  #
-  #   WebDAV
-  #
-  ##############################################################################
-  """
-
-  # WebDAV Interface.
-  # -----------------
-  __implements__ = (WriteLockInterface,)
-
-  # ----------------------------------------------------------------------------
-  #  ZMSObject._checkWebDAVLock
-  # ----------------------------------------------------------------------------
-  def _checkWebDAVLock(self):
-    if self.wl_isLocked():
-      raise ResourceLockedError, 'This %s Object is locked via WebDAV' % self.meta_type
-
-  # ----------------------------------------------------------------------------
-  #  ZMSObject.document_src
-  # ----------------------------------------------------------------------------
-  def document_src(self, REQUEST={}):
-    """ document_src returns ZMSAttributes as XML """
-    return self.toXml(REQUEST, incl_embedded=False, deep=False)
-
-  manage_DAVget = manage_FTPget = document_src
-
 ################################################################################

ZMS/trunk/_zreferableitem.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTML, HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 import operator

ZMS/trunk/changes.txt

@@ -1371 +1371 @@
 [01271] Increased col-size threshold for string -> text in SQL-Datasource from 50 to 128 (requested by fh).
 --------------------------------------------------
+2009-10-19:zms-2.11.4-02
+[01271] Revised imports from Globals with respect for deprecation warnings in Zope2-2.12.0.
+[01272] Removed webdav-support for compatibility with Zope2-2.12.0.
+[01273] Added support to SQL-Datasource for auto re-connect and setting character-set to utf-8 on MySql (contributed by C. Meier).
+[01274] Added support for logging to event.log (requested by xm).
+[01275] Added support for overwriting configuration of $ZMS_HOME/import/configure.zcml by $INSTANCE_HOME/etc/zms/import/configure.zcml(requested by xm).
+--------------------------------------------------

ZMS/trunk/dtml/ZMSContainerObject/manage_importexportdebugfilter.dtml

@@ -39 +39 @@
 <input type="hidden" name="outfilename" value="<dtml-var outfilename>"/>
 
-<input class="form-submit" type="submit" name="btn" value="<dtml-var "getZMILangStr('BTN_NEXT')">"/>
-<input class="form-submit" type="submit" name="btn" value="<dtml-var "getZMILangStr('BTN_CANCEL')">"/>
+<input class="form-submit" type="submit" name="btn" value="&nbsp;&raquo;&nbsp;"/>
 <hr size="1"/>
 
@@ -74 +73 @@
          ></td><td class="form-small" style="color:blue"><b>&nbsp;{IN}</b></td></tr>
         <dtml-elif "filter['format']=='export'">
-         <tr><td align="center" class="form-small" style="<dtml-if "step==0">border: 2px solid red; </dtml-if>white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
+         <tr><td align="center" class="form-small" style="white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
           ><dtml-var "filter['format'].capitalize()"> <font style="font-weight: bold; color:#D9E100; background-color:#000000;">&nbsp;ZMS&nbsp;</font></td></tr>
         <dtml-elif "filter['format']=='XHTML'">
-         <tr><td align="center" class="form-small" style="<dtml-if "step==0">border: 2px solid red; </dtml-if>white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
+         <tr><td align="center" class="form-small" style="white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
           ><img src="<dtml-var MISC_ZMS>mime_type.text_html.gif" title="<dtml-var "filter['format']">" border="0" align="absmiddle" /><dtml-var "filter['format']"> <font style="font-weight: bold; color:#D9E100; background-color:#000000;">&nbsp;ZMS&nbsp;</font></td></tr>
         <dtml-elif "filter['format'] in ['XML','XML_incl_embedded']">
-         <tr><td align="center" class="form-small" style="<dtml-if "step==0">border: 2px solid red; </dtml-if>white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
+         <tr><td align="center" class="form-small" style="white-space: nowrap; color:white; background-color:black; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"
           ><img src="<dtml-var MISC_ZMS>mime_type.text_xml.gif" title="<dtml-var "filter['format']">" border="0" align="absmiddle" /><dtml-var "filter['format']"> <font style="font-weight: bold; color:#D9E100; background-color:#000000;">&nbsp;ZMS&nbsp;</font></td></tr>
         </dtml-if>
@@ -90 +89 @@
            <dtml-if "filterProcess.get('file',None)">
             <dtml-let f="filterProcess['file']">
-             <td align="center" class="form-small" style="<dtml-if "step==pid+1">border: 2px solid red;<dtml-else>border: 1px solid navy;</dtml-if> white-space: nowrap; background-color: white; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;">
+             <td align="center" class="form-small" style="<dtml-if "step==pid">border: 2px solid red;<dtml-else>border: 1px solid navy;</dtml-if> white-space: nowrap; background-color: white; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;">
               <dtml-if "len(process.keys())==1"><img src="<dtml-var MISC_ZMS>ico_error.gif" title="ERROR: Processing-step type '<dtml-var "process['id']">' not found!" border="0" align="absmiddle"/>&nbsp;<span style="border: 2px solid red;"></dtml-if>
               <img src="<dtml-var "f.getMimeTypeIconSrc()">" title="<dtml-var "f.getContentType()">, <dtml-var "f.getDataSizeStr()">" border="0" align="absmiddle"/>
@@ -101 +100 @@
           <dtml-else>
           <tr>
-           <td align="center" class="form-small" style="<dtml-if "step==pid+1">border: 2px solid red;<dtml-else>border: 1px solid maroon;</dtml-if> white-space: nowrap; background-color: #FFFFE0; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"><dtml-var "process['name']" html_quote></td>
+           <td align="center" class="form-small" style="<dtml-if "step==pid">border: 2px solid red;<dtml-else>border: 1px solid maroon;</dtml-if> white-space: nowrap; background-color: #FFFFE0; padding:2px; margin-left:4px; margin-right:4px; margin-top:0px; margin-bottom:0px;"><dtml-var "process['name']" html_quote></td>
            <dtml-if "filterProcess.get('file',None)">
             <dtml-let f="filterProcess['file']">
@@ -140 +139 @@
 
 <hr size="1"/>
-<input class="form-submit" type="submit" name="btn" value="<dtml-var "getZMILangStr('BTN_NEXT')">"/>
-<input class="form-submit" type="submit" name="btn" value="<dtml-var "getZMILangStr('BTN_CANCEL')">"/>
-
+<input class="form-submit" type="submit" name="btn" value="&nbsp;&raquo;&nbsp;"/>
 </form>
 

ZMS/trunk/dtml/ZMSContainerObject/manage_main_change.dtml

@@ -4 +4 @@
 <img src="<dtml-var MISC_ZMS>state_locked.gif" border="0" title="<dtml-var "getZMILangStr('STATE_LOCKED')"> <dtml-var "getZMILangStr('BY')"> <dtml-var "_.getattr(ob,'co_uid_%s'%lang)"> (<dtml-var "getLangFmtDate(_.getattr(ob,'co_dat_%s'%lang),manage_lang)">)" align="middle"/>
 </dtml-if>
-</dtml-unless>
-
-<dtml-comment>#####  WebDav-Lock  ###############################</dtml-comment>
-<dtml-unless "REQUEST.form.has_key('ZMS_VERSION_%s'%id)">
-<dtml-try>
- <dtml-if "wl_isLocked()==1">
-  <img src="/p_/davlocked">
- </dtml-if>
-<dtml-except>
-</dtml-try>
 </dtml-unless>
 

ZMS/trunk/dtml/ZMSContainerObject/manage_system.dtml

@@ -126 +126 @@
   &dtml-sequence-key; <dtml-if title>(&dtml-title;)</dtml-if>
   </a>
-  <dtml-comment>
-  <!-- ### WebDav-Lock  -->
-  </dtml-comment>
-  <dtml-try>
-    <dtml-if "wl_isLocked()==1">
-      <img src="/p_/davlocked">
-    </dtml-if>
-  <dtml-except>
-  </dtml-try>
   <dtml-if locked_in_version>
     <dtml-if modified_in_version>

ZMS/trunk/dtml/object/f_breadcrumbs.dtml

@@ -43 +43 @@
  </dtml-in>
 </dtml-if>
-<dtml-comment>
-<!-- ### WebDav-Lock  -->
-</dtml-comment>
-<dtml-try>
- <dtml-if "wl_isLocked()==1">
-  <img src="/p_/davlocked">
- </dtml-if>
-<dtml-except>
-</dtml-try>
 </span>

ZMS/trunk/import/default_win32.filter.xml

@@ -2404 +2404 @@
   <xsl:attribute-set name="th">
     <xsl:attribute name="font-size">9pt</xsl:attribute>
-    <xsl:attribute name="font-weight">bolder</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="text-align">center</xsl:attribute>
     <xsl:attribute name="background-color">silver</xsl:attribute>
@@ -2431 +2431 @@
   
   <xsl:attribute-set name="b">
-    <xsl:attribute name="font-weight">bolder</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
   <xsl:attribute-set name="strong">
-    <xsl:attribute name="font-weight">bolder</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
   
   <xsl:attribute-set name="strong-em">
-    <xsl:attribute name="font-weight">bolder</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="font-style">italic</xsl:attribute>
   </xsl:attribute-set>
@@ -4348 +4348 @@
 <item key="command"><![CDATA[<!-- BO htmlEntities -->
 
-<dtml-let htmlEntities="[]" htmlIn="str(localfs_read(ZMS_FILTER_IN))">
+<dtml-let htmlEntities="[]" htmlIn="str(localfs_read(ZMS_FILTER_IN,{'mode':'b','theshold':2**16}))">
  <dtml-call "htmlEntities.append('<!DOCTYPE html ')">
  <dtml-call "htmlEntities.append('     PUBLIC '+QUOT+'-//W3C//DTD XHTML 1.0 Transitional//EN'+QUOT)">

ZMS/trunk/version.txt

@@ -1 @@
-ZMS 2.11.4-01
+ZMS 2.11.4-02

ZMS/trunk/zms.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
 from AccessControl.User import UserFolder
 from App.Common import package_home
+from App.special_dtml import HTMLFile
 from OFS.Image import Image
 from sys import *
@@ -908 +908 @@
       if build != self.zms_build:
         REQUEST.set('recurse_updateVersionBuild',True)
+        _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from build #%s%s to #%s%s...'%(build,patch,self.zms_build,self.zms_patch))
         message += recurse_updateVersionBuild( self, self, REQUEST)
+        _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from build #%s%s to #%s%s - Finished!'%(build,patch,self.zms_build,self.zms_patch))
         setattr( self, 'build', self.zms_build)
         message += 'Synchronized object-model from build #%s%s to #%s%s!<br/>'%(build,patch,self.zms_build,self.zms_patch)
       if build != self.zms_build or patch != self.zms_patch:
         REQUEST.set('recurse_updateVersionPatch',True)
+        _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from patch #%s%s to #%s%s...'%(build,patch,self.zms_build,self.zms_patch))
         message += recurse_updateVersionPatch( self, self, REQUEST)
+        _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from patch #%s%s to #%s%s - Finished!'%(build,patch,self.zms_build,self.zms_patch))
         setattr( self, 'patch', self.zms_patch)
         message += 'Synchronized object-model from patch #%s%s to #%s%s!<br/>'%(build,patch,self.zms_build,self.zms_patch)

ZMS/trunk/zmscontainerobject.py

@@ -25 +25 @@
 from __future__ import nested_scopes
 from App.Common import package_home
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import AccessControl.Role
 import copy
@@ -287 +287 @@
       """ 
       
-      self._checkWebDAVLock()
       message = ''
       t0 = time.time()
@@ -320 +319 @@
       """ 
       
-      self._checkWebDAVLock()
       message = ''
       t0 = time.time()
@@ -357 +355 @@
       """
       
-      self._checkWebDAVLock()
       message = ''
       t0 = time.time()

ZMS/trunk/zmscustom.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from types import StringTypes
 import sys

ZMS/trunk/zmslinkcontainer.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import time
 import urllib
@@ -127 +127 @@
         
       self._checkZMSLock()
-      self._checkWebDAVLock()
       message = ''
       

ZMS/trunk/zmslinkelement.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import sys
 import urllib
@@ -279 +279 @@
       
       self._checkZMSLock()
-      self._checkWebDAVLock()
       target = REQUEST.get( 'manage_target', '%s/manage_main'%self.getParentNode().absolute_url())
       message = ''

ZMS/trunk/zmslog.py

@@ -23 +23 @@
 
 # Imports.
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 import logging
 import os

ZMS/trunk/zmsobject.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTMLFile
+from App.special_dtml import HTMLFile
 from types import StringTypes
-from webdav.Lockable import ResourceLockedError
 import ZPublisher.HTTPRequest
 import urllib
@@ -572 +571 @@
       
       self._checkZMSLock()
-      self._checkWebDAVLock()
       message = ''
       messagekey = 'manage_tabs_message'
@@ -882 +880 @@
       req = self.REQUEST
       if self.isCheckedOut(req) and not self.isCheckedOutByMe(req):
-        raise ResourceLockedError, 'This Object is locked by another user'
+        raise 'ResourceLockedError', 'This Object is locked by another user'
 
     # --------------------------------------------------------------------------
@@ -1402 +1400 @@
     def manage_moveObjUp(self, lang, REQUEST, RESPONSE):
       """ ZMSObject.manage_moveObjUp """
-      self._checkWebDAVLock()
       parent = self.getParentNode()
       sort_id = self.getSortId()
@@ -1419 +1416 @@
     def manage_moveObjDown(self, lang, REQUEST, RESPONSE):
       """ ZMSObject.manage_moveObjDown """
-      self._checkWebDAVLock()
       parent = self.getParentNode()
       sort_id = self.getSortId()
@@ -1436 +1432 @@
     def manage_moveObjToPos(self, lang, pos, REQUEST, RESPONSE):
       """ ZMSObject.manage_moveObjToPos """
-      self._checkWebDAVLock()
       parent = self.getParentNode()
       if pos == 1:

ZMS/trunk/zmssqldb.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTML, HTMLFile
+from App.special_dtml import HTMLFile
 from Products.ZSQLMethods.SQL import SQLConnectionIDs
 import copy
@@ -223 +223 @@
     def getDA(self):
       da = getattr(self,self.connection_id)
+      # Try to re-connect if not connected.
+      try: 
+        dbc = da._v_database_connection 
+      except AttributeError: 
+        da.connect(da.connection_string) 
+        dbc = da._v_database_connection
+      # Try to set character-set to utf-8 (should at least work on MySql).
+      try:
+        dbc.query('SET NAMES utf8') 
+        dbc.query('SET CHARACTER SET utf8')
+      except:
+        pass
       return da
 

ZMS/trunk/zmstrashcan.py

@@ -24 +24 @@
 # Imports.
 from __future__ import nested_scopes
-from Globals import HTML, HTMLFile
+from App.special_dtml import HTMLFile
 import copy
 import string