[Erp5-report] r9479 - in /erp5/trunk/products/ERP5OOo: Document/ PropertySheet/

[nobody at svn.erp5.org]

Author: bartek
Date: Sat Aug 26 20:02:30 2006
New Revision: 9479

URL: http://svn.erp5.org?rev=9479&view=rev
Log:
filename stored as source_reference; setting properties from a parsed filename using regexp from preferences;

Modified:
    erp5/trunk/products/ERP5OOo/Document/DMSFile.py
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
    erp5/trunk/products/ERP5OOo/PropertySheet/DMSFile.py

Modified: erp5/trunk/products/ERP5OOo/Document/DMSFile.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/DMSFile.py?rev=9479&r1=9478&r2=9479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/DMSFile.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/DMSFile.py Sat Aug 26 20:02:30 2006
@@ -158,7 +158,7 @@
   edit=File.edit
 
   searchable_attrs=('title','description','id','reference','version',
-      'short_title','keywords','subject','original_filename','source_project_title')
+      'short_title','keywords','subject','source_reference','source_project_title')
 
   ### Content indexing methods
   security.declareProtected(Permissions.View, 'getSearchableText')
@@ -195,6 +195,20 @@
         self.content_type=content_type
     return content_type
 
+  security.declareProtected(Permissions.ModifyPortalContent, 'setPropertiesFromFilename')
+  def setPropertiesFromFilename(self,fname):
+    rx_parse=re.compile(self.portal_preferences.getPreferredDmsFilenameRegexp())
+    if rx_parse is None:
+      self.setReference(fname)
+      return
+    m=rx_parse.match(fname)
+    if m is None:
+      self.setReference(fname)
+      return
+    for k,v in m.groupdict().items():
+      self.setProperty(k,v)
+
+
 
   # BG copied from File in case
   index_html = CMFFile.index_html

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=9479&r1=9478&r2=9479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py Sat Aug 26 20:02:30 2006
@@ -219,7 +219,7 @@
     """
     sp=self._mkProxy()
     #self.log('_convert',enc(self._unpackData(self.data))[:500])
-    kw=sp.run_convert(self.getOriginalFilename(),enc(self._unpackData(self.data)))
+    kw=sp.run_convert(self.getSourceReference(),enc(self._unpackData(self.data)))
     self.oo_data=Pdata(dec(kw['data']))
     # now we get text content 
     text_data=self.extractTextContent()
@@ -266,7 +266,7 @@
     self.setLanguage(meta.get('language',''))
     if meta.get('MIMEType',False):
       self.setMimeType(meta['MIMEType'])
-    self.setReference(meta.get('reference',''))
+    #self.setReference(meta.get('reference',''))
 
   #security.declareProtected(Permissions.View,'getOOfile')
   def getOOfile(self):
@@ -285,8 +285,6 @@
     """
     Checks whether we have an initial file
     """
-    print 'IS INSTANCE'
-    print isinstance(self,object)
     _marker=[]
     if getattr(self,'data',_marker) is not _marker: # XXX - use propertysheet accessors
       return getattr(self,'data') is not None
@@ -458,7 +456,7 @@
     """
     # real version:
     sp=self._mkProxy()
-    kw=sp.run_generate(self.getOriginalFilename(),enc(self._unpackData(self.oo_data)),None,format)
+    kw=sp.run_generate(self.getSourceReference(),enc(self._unpackData(self.oo_data)),None,format)
     #self.log('_makeFile',mime)
     return kw['mime'],Pdata(dec(kw['data']))
 

Modified: erp5/trunk/products/ERP5OOo/PropertySheet/DMSFile.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/PropertySheet/DMSFile.py?rev=9479&r1=9478&r2=9479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/PropertySheet/DMSFile.py (original)
+++ erp5/trunk/products/ERP5OOo/PropertySheet/DMSFile.py Sat Aug 26 20:02:30 2006
@@ -31,10 +31,6 @@
   """
 
   _properties = (
-    { 'id'    : 'original_filename',
-    'description' : 'name of the uploaded file',
-    'type'    : 'string',
-    'mode'    : '' },
     )
 
   _categories = ('destination','similar','predecessor','successor','source_project','publication_section','classification',