Changeset 388 for trunk

Timestamp:

07/21/10 09:25:53 (11 years ago)

Author:

sander

Message:

Do not add missing validators to non-ODF results

Location:

trunk/server/www/app

Files:

• models/validator.php (modified) (2 diffs)
• vendors/shells/validators.php (modified) (2 diffs)

trunk/server/www/app/models/validator.php

@@ -59 +59 @@
 
                 $this->read();
-                if ($this->data['Request']['id']) {
-                        $this->Request->id = $this->data['Request']['id'];
-                        $file = $this->Request->getPath();
-                        $destination = $this->data['Request']['path'];
-                } else {
-                        $this->Result->id = $this->data['Result']['id'];
-                        $file = $this->Result->getPath();
-                        $destination = $this->data['Result']['path'];
-                }
-
-                $className = $this->data['Validator']['name'] . 'Validator';
-                if (!$this->data['Validator']['name'] || !class_exists($className)) {
-                        $this->log('Invalid ODF Validator: ' . $this->data['Validator']['name'] . 'Validator');
-                        return;
-                }
-
-                $validator = new $className();
+                if (!($validator = $this->_getValidator())) {
+                        return;
+                }
+
                 $validator->run($file);
 
                 // Save the validator result to file
+                $destination = $this->_getPath();
                 $destination = FILES . $destination . DS . strtolower($this->data['Validator']['name']) . '-validator.' . $validator->ext;
                 file_put_contents($destination, $validator->response);
@@ -86 +74 @@
                 $this->data['Validator']['response'] = $validator->response;
                 $this->save();
+        }
+
+        /**
+         * Delete the on-disk validator result
+         */
+        public function beforeDelete($cascade)
+        {
+                if (!$this->id) {
+                        return false;
+                }
+
+                $this->read();
+                if (!($validator = $this->_getValidator())) {
+                        return true;
+                }
+
+                if ($destination = $this->_getPath()) {
+                        $destination = FILES . $destination . DS . strtolower($this->data['Validator']['name']) . '-validator.' . $validator->ext;
+                        if (file_exists($destination)) {
+                                @unlink($destination);
+                        }
+                }
+
+                return true;
+        }
+
+        /**
+         * Get the validator class based off $this->data
+         */
+        private function _getValidator()
+        {
+                $className = $this->data['Validator']['name'] . 'Validator';
+                if (!$this->data['Validator']['name'] || !class_exists($className)) {
+                        $this->log('Invalid ODF Validator: ' . $this->data['Validator']['name'] . 'Validator');
+                        return null;
+                }
+
+                return new $className();
+        }
+
+        /**
+         * Get the Request.path or Result.path from $this->data
+         */
+        private function _getPath()
+        {
+                if ($this->data['Request']['id']) {
+                        $this->Request->id = $this->data['Request']['id'];
+                        $file = $this->Request->getPath();
+                        return $this->data['Request']['path'];
+                }
+
+                $this->Result->id = $this->data['Result']['id'];
+                $file = $this->Result->getPath();
+                return $this->data['Result']['path'];
         }
 }

trunk/server/www/app/vendors/shells/validators.php

@@ -75 +75 @@
                         'Job',
                         'Job.Result',
+                        'Job.Result.Format',
                         'Job.Result.Validator' => array('fields' => 'name'),
                 ));
@@ -102 +103 @@
                 foreach ($results as $result) {
                         if (empty($result['Result'])) {
+                                continue;
+                        }
+
+                        // If this is not and ODF roundtrip result, remove any validators and continue.
+                        // There was an old bug here that could cause non-ODF results to be assigned validators
+                        if ($result['Result']['Format']['code'] != 'odf') {
+                                foreach ($result['Result']['Validator'] as $validator_bug) {
+                                        $this->Validator->id = $validator_bug['id'];
+                                        $this->Validator->delete();
+                                }
+                                
                                 continue;
                         }