Changeset 14637 for main/waeup.kofa/trunk

Timestamp:

20 Mar 2017, 09:35:50 (8 years ago)

Author:

Henrik Bettermann

Message:

Change name of fingerprint minutiae files in order to be compatible with the fingerprint viewlet download_names in the waeup.uniben custom package.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• tests/test_webservices.py (modified) (3 diffs)
• webservices.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_webservices.py

@@ -435 +435 @@
         self.assertEqual(result, True)
         stored_file = getUtility(IExtFileStore).getFileByContext(
-            self.student, attr="1.fpm")
+            self.student, attr="finger1.fpm")
         self.assertEqual(stored_file.read(), 'FP1faked_fpm')
 
@@ -449 +449 @@
         self.assertEqual(result, True)
         stored_file1 = getUtility(IExtFileStore).getFileByContext(
-            self.student, attr="1.fpm")
+            self.student, attr="finger1.fpm")
         stored_file2 = getUtility(IExtFileStore).getFileByContext(
-            self.student, attr="3.fpm")
+            self.student, attr="finger3.fpm")
         self.assertEqual(stored_file1.read(), 'FP1faked_fpm1')
         self.assertEqual(stored_file2.read(), 'FP1faked_fpm2')
@@ -490 +490 @@
         server = ServerProxy('http://mgr:mgrpw@localhost/app')
         self.setup_student(self.student)
-        self.create_fpm_file(self.student, '1')
+        self.create_fpm_file(self.student, 'finger1')
         result = server.get_student_fingerprints(self.student.student_id)
         self.assertTrue('1' in result['fingerprints'].keys())

main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py

@@ -292 +292 @@
             file_store = getUtility(IExtFileStore)
             file_id = IFileStoreNameChooser(student).chooseName(
-                attr='%s.fpm' % num)
+                attr='finger%s.fpm' % num)
             file_store.createFile(file_id, StringIO(val.data))
             result = True
@@ -334 +334 @@
         for num in [str(x + 1) for x in range(10)]:
             fp_file = file_store.getFileByContext(
-                student, attr='%s.fpm' % num)
+                student, attr='finger%s.fpm' % num)
             if fp_file is not None:
                 result['fingerprints'][num] = xmlrpclib.Binary(fp_file.read())