Changeset 740

Timestamp:

03/28/07 16:42:51 (2 years ago)

Author:

thomase

Message:

Closes ticket #238. Name.nameAttested is now validated when populated through-the-web or via Extensions.loader.load_place. Both Greek (ancient) and Latin writing systems are supported - modern Greek accented characters are permitted too (bad?). Thorough tests for both. Adding more scripts should be straightforward without further UML changes (see ws_validation.py). Got rid of moribund dependencies on cooking.py, which is no longer used and so has been removed.

Files:

• PleiadesEntity/trunk/Extensions/cooking.py (deleted)
• PleiadesEntity/trunk/Extensions/loader.py (modified) (2 diffs)
• PleiadesEntity/trunk/Extensions/ws_grek.py (modified) (1 diff)
• PleiadesEntity/trunk/Extensions/ws_latn.py (added)
• PleiadesEntity/trunk/Extensions/ws_validation.py (added)
• PleiadesEntity/trunk/content/Name.py (modified) (2 diffs)
• PleiadesEntity/trunk/models/PleiadesEntity.zargo (modified) (previous)
• PleiadesEntity/trunk/models/PleiadesEntityUML.png (modified) (previous)
• PleiadesEntity/trunk/tests/NameViews.txt (modified) (1 diff)
• PleiadesEntity/trunk/tests/Names.txt (added)
• PleiadesEntity/trunk/tests/WSValidation.txt (added)
• PleiadesEntity/trunk/tests/_testing.py.template (modified) (1 diff)
• PleiadesEntity/trunk/tests/data/nametwister.xml (added)
• PleiadesEntity/trunk/version.txt (modified) (1 diff)

PleiadesEntity/trunk/Extensions/loader.py

@@ -38 +38 @@
-
-from Products.PleiadesEntity.Extensions.xmlutil import *
-cooking import *
+ws_validation import validate_name
-
-from Products.PleiadesEntity.config import *
@@ -219 +219 @@
-            nameAttested = ''
-            nameLanguage = ''
+            
+        if nameAttested and nameLanguage:
+            invalid = validate_name(nameLanguage, nameAttested.encode('utf-8'))
+            if invalid:
+                raise EntityLoadError, invalid.decode('utf-8').encode('ascii', 'backslashreplace')
-        
-        d = e.findall("{%s}description" % DC)

PleiadesEntity/trunk/Extensions/ws_grek.py

@@ -311 +311 @@
-                        pass
-            if not(b):
-(i, c, cval, 'illegal character in appropriate Unicode range')
+{'position':i, 'character':c, 'reason':'illegal character in appropriate Unicode range'}
-        else:
-(i, c, cval, 'illegal character from outside appropriate Unicode range')
+{'position':i, 'character':c, 'reason':'illegal character from outside appropriate Unicode range'}
-    return invalids
-

PleiadesEntity/trunk/content/Name.py

@@ -34 +34 @@
-from Products.PleiadesEntity.config import *
-
-# additional imports from tagged value 'import'
-from Products.PleiadesEntity.Extensions.cooking import *
-
-##code-section module-header #fill in your manual code here
+from Products.CMFCore.permissions import View
+from Products.PleiadesEntity.Extensions.ws_validation import validate_name
-##/code-section module-header
-
@@ -162 +161 @@
-        return periods
-
+    security.declareProtected(View, 'post_validate')
+    def post_validate(self, REQUEST=None, errors=None):
+        vNameLanguage = REQUEST.get('nameLanguage', None)
+        vNameAttested = REQUEST.get('nameAttested', None)
+        invalid = validate_name(vNameLanguage, vNameAttested)
+        if len(invalid) > 0:
+            errors['nameAttested'] = invalid
+
-
-registerType(Name, PROJECTNAME)

PleiadesEntity/trunk/tests/NameViews.txt

@@ -54 +54 @@
-    '...Name as Attested...'
-    
-
-
-
-
-
-
-
-
-
-
-
+
+
-    
+    >>> browser.contents
+    '...Name type...'
-    
+    >>> browser.contents
+    '...Accuracy of Attestation...'
+    
+    >>> browser.contents
+    '...Completeness of Attestation...'
+    
+    >>> browser.contents
+    '...Temporal attestations...'
+    
+    >>> browser.contents
+    '...Primary References...'
+    
+    >>> browser.contents
+    '...Secondary references...'
+    
+Edit the name, modify the attestation using legal characters and language to verify validation
+
+    >>> browser.getLink('Log in').click()
+    >>> browser.getControl('Login Name').value = 'test_user_1_'
+    >>> browser.getControl('Password').value = 'secret'
+    >>> browser.getControl('Log in').click()
+    >>> url = url + '/base_edit'
+    >>> browser.open(url)
+    >>> control = browser.getControl(name='nameAttested')
+    >>> control.value = 'Innoxium Municipium'
+    >>> control = browser.getControl(name='nameLanguage')
+    >>> control.value = ['la']
+    >>> control = browser.getControl(name='title')
+    >>> control.value = 'Innoxium Municipium'
+    >>> browser.getControl(name='form_submit').click()
+    >>> browser.contents
+    '...Changes saved...'
+
+Edit the name again, modify the attestation using illegal characters and language to verify validation
+
+    >>> url = url + '/base_edit'
+    >>> browser.open(url)
+    >>> control = browser.getControl(name='nameAttested')
+    >>> control.value = 'Municipium Noxium Maximum'
+    >>> control = browser.getControl(name='nameLanguage')
+    >>> control.value = ['grc']
+    >>> control = browser.getControl(name='title')
+    >>> control.value = 'Municipium Noxium Maximum'
+    >>> browser.getControl(name='form_submit').click()
+    >>> browser.contents
+    '...23 invalid character(s) in name Municipium Noxium Maximum...'

PleiadesEntity/trunk/tests/_testing.py.template

@@ -14 +14 @@
-from Products.PleiadesEntity.Extensions.loader import BA_ID_MAX
-from Products.PleiadesEntity.Extensions.xmlutil import purifyText
-from Products.PleiadesEntity.Extensions.cooking import setGeoTitleFromNames
-

PleiadesEntity/trunk/version.txt

@@ -1 @@
-59
+60