Changeset 293

Timestamp:

02/08/10 16:55:58 (10 years ago)

Author:

sander

Message:

Recursively import testsuites into recusrive galleries

Location:

trunk/server/www/app

Files:

• config/bootstrap.php (modified) (1 diff)
• config/sql/schema.php (modified) (2 diffs)
• controllers/galleries_controller.php (modified) (4 diffs)
• files/testsuites (added)
• files/testsuites/source (added)
• models/behaviors/file.php (modified) (9 diffs)
• models/gallery.php (modified) (2 diffs)
• models/job.php (modified) (1 diff)
• models/request.php (modified) (6 diffs)
• models/result.php (modified) (1 diff)
• models/testsuite.php (added)
• vendors/shells/cron.php (modified) (2 diffs)
• views/elements/gallery.ctp (modified) (2 diffs)
• views/galleries/view.ctp (modified) (2 diffs)

trunk/server/www/app/config/bootstrap.php

@@ -33 +33 @@
  *
  */
+
+/**
+ * Set a path to the files directory
+ */
+define('FILES', APP . 'files' . DS);
 
 /**

trunk/server/www/app/config/sql/schema.php

@@ -1 +1 @@
 <?php 
 /* SVN FILE: $Id$ */
-/* App schema generated on: 2010-02-03 13:02:23 : 1265200163*/
+/* App schema generated on: 2010-02-08 17:02:52 : 1265644912*/
 class AppSchema extends CakeSchema {
         var $name = 'App';
@@ -178 +178 @@
                         'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
                 );
+        var $testsuites = array(
+                        'id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'primary'),
+                        'name' => array('type' => 'string', 'null' => false, 'default' => NULL),
+                        'source' => array('type' => 'text', 'null' => false, 'default' => NULL),
+                        'root' => array('type' => 'text', 'null' => false, 'default' => NULL),
+                        'gallery_id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'index'),
+                        'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+                        'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+                        'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'gallery_id' => array('column' => 'gallery_id', 'unique' => 0))
+                );
         var $users = array(
                         'id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'primary'),

trunk/server/www/app/controllers/galleries_controller.php

@@ -73 +73 @@
 
         /**
+         * Sort an array of Galleries threaded, like find('threaded') would do
+         */
+        private function _sortThreaded($results)
+        {
+                $return = $idMap = array();
+                $ids = Set::extract($results, '{n}.Gallery.id');
+
+                foreach ($results as $result) {
+                        $result['children'] = array();
+                        $id = $result['Gallery']['id'];
+                        $parentId = $result['Gallery']['parent_id'];
+                        if (isset($idMap[$id]['children'])) {
+                                $idMap[$id] = array_merge($result, (array)$idMap[$id]);
+                        } else {
+                                $idMap[$id] = array_merge($result, array('children' => array()));
+                        }
+                        if (!$parentId || !in_array($parentId, $ids)) {
+                                $return[] =& $idMap[$id];
+                        } else {
+                                $idMap[$parentId]['children'][] =& $idMap[$id];
+                        }
+                }
+                if (count($return) > 1) {
+                        $ids = array_unique(Set::extract('/Gallery/parent_id', $return));
+                        if (count($ids) > 1) {
+                                $root = $return[0]['Gallery']['parent_id'];
+                                foreach ($return as $key => $value) {
+                                        if ($value['Gallery']['parent_id'] != $root) {
+                                                unset($return[$key]);
+                                        }
+                                }
+                        }
+                }
+                return $return;
+        }
+
+        /**
          * Show a list of all galleries
          */
@@ -81 +118 @@
 
                 foreach ($galleries as &$gallery) {
-                        $num_documents = $this->Request->query('SELECT COUNT(*) as `count`
-                                FROM `requests` AS `Request`
-                                LEFT JOIN `galleries_requests` AS `GalleriesRequest`
-                                        ON `Request`.`id` = `GalleriesRequest`.`request_id`
-                                LEFT JOIN `galleries` AS `Gallery`
-                                        ON `GalleriesRequest`.`gallery_id` = `Gallery`.`id`
-                                WHERE
-                                        `Gallery`.`id` > ' . $gallery['Gallery']['lft'] . '
-                                        AND `Gallery`.`id` < ' . $gallery['Gallery']['rght']);
-                        $gallery['Gallery']['num_documents'] = sizeof($gallery['Request']) + $num_documents[0][0]['count'];
+                        $gallery['Gallery']['num_documents'] = $this->Gallery->requestCount($gallery['Gallery']['id'], true);
                 }
 
@@ -122 +150 @@
 
                 // Get the children of this gallery
-                $children = $this->Gallery->find('threaded', array(
+                // TODO: Do this without recursion below Request because it generates ridiculous amounts of
+                // duplicate queries that slow the system *a lot*
+                $children = $this->Gallery->find('all', array(
                         'conditions' => array(
-                                'Gallery.id >' => $gallery['Gallery']['lft'],
-                                'Gallery.id <' => $gallery['Gallery']['rght'],
+                                'Gallery.lft >' => $gallery['Gallery']['lft'],
+                                'Gallery.rght <' => $gallery['Gallery']['rght'],
                         ),
-                        'contain' => array(
-                                'Request',
-                                'Request.Validator',
-                                'Request.Job',
-                                'Request.Job.Application',
-                                'Request.Job.Platform',
-                                'Request.Job.Result',
-                                'Request.Job.Result.Validator',
-                        ),
-                ));
+                        'contain' => array('Request'),
+                ));
+
+                foreach ($children as &$child) {
+                        foreach ($child['Request'] as &$request) {
+                                $request['Validator'] = $this->Request->Validator->find('all', array(
+                                        'conditions' => array('Validator.parent_id' => $request['id']),
+                                        'recursive'  => -1,
+                                ));
+
+                                $request['Job'] = $this->Request->Job->find('all', array(
+                                        'conditions' => array('Job.request_id' => $request['id']),
+                                        'contain' => array(
+                                                'Application',
+                                                'Platform',
+                                                'Result',
+                                                'Result.Validator'
+                                        ),
+                                ));
+                        }
+                }
+
+                $gallery['children'] = $this->_sortThreaded($children);
 
                 // Get the path to this gallery
@@ -144 +187 @@
                 // Check access
                 $access = $this->_checkAccess($slug);
-
-                $gallery['children'] =& $children;
                 $this->set(compact('gallery', 'path', 'access'));
         }

trunk/server/www/app/models/behaviors/file.php

@@ -50 +50 @@
         public function setup(&$model, $config = array())
         {
-                if (!is_array($config)) {
-                        $config = array('directory' => $config);
-                }
-
-                $this->settings = array_merge($this->settings, $config);
-
-                if (!$this->settings['directory']) {
-                        $this->settings['directory'] = 'files';
-                }
-
-                $cwd = getcwd();
-                chdir(APP);
-                $this->settings['directory'] = realpath($this->settings['directory']);
-                chdir($cwd);
-
-                if (!is_writeable($this->settings['directory'])) {
+                if (is_array($config)) {
+                        $this->settings = array_merge($this->settings, $config);
+                }
+
+                if (!is_writeable(FILES)) {
                         $this->errors[] = __('File storage directory is not writeable.', true);
                         return;
@@ -83 +72 @@
         public function setFileUpload(&$model, $file = array())
         {
+                $this->errors = array();
+
                 if (!is_array($file) || sizeof($file) == 0) {
                         $this->errors[] = __('There was no uploaded file', true);
@@ -122 +113 @@
                 }
 
-                $destination = $this->settings['directory'] . DS . $model->data[$model->name][$this->settings['fields']['path']] . DS . $file['name'];
+                $destination = FILES . $model->data[$model->name][$this->settings['fields']['path']] . DS . $file['name'];
                 if (!mkdir(dirname($destination), 0775, true)) {
                         $this->errors[] = __('Could not create the destination directory.', true);
@@ -151 +142 @@
         public function setFileBuffer(&$model, &$buffer, $filename, $filters = false)
         {
-                $destination = $this->settings['directory'] . DS . $model->data[$model->name][$this->settings['fields']['path']] . DS . $filename;
+                $this->errors = array();
+                $destination = FILES . $model->data[$model->name][$this->settings['fields']['path']] . DS . $filename;
 
                 if (!file_exists(dirname($destination)) && !mkdir(dirname($destination), 0775, true)) {
@@ -199 +191 @@
 
         /**
+         * Set the file records to any file
+         *
+         * @param object $model A reference to the model
+         * @param string $path full path to the file
+         * @param string $filename The filename that the file should get. Leave as false for the original filename
+         * @param boolean $move True if the file should be moved, false if it should be copied.
+         * @return boolean True on success or false on failure
+         */
+        public function setFile(&$model, $path = false, $filename = false, $move = false)
+        {
+                $this->errors = array();
+
+                if (!$path) {
+                        $this->errors[] = __('There was no file', true);
+                        return false;
+                }
+
+                if (!is_readable($path)) {
+                        $this->errors[] = __('The file cannot be read.', true);
+                        return false;
+                }
+
+                $mimestring = '';
+                if (!$mimetype = $this->_getMimetype($model, $path, $mimestring)) {
+                        $this->errors[] = sprintf(__('Invalid mimetype %s detected for file', true), $mimestring);
+                        return false;
+                }
+
+                if (!$this->_checkMimetype($mimetype)) {
+                        $this->errors[] = __('Illegal mimetype.', true);
+                        return false;
+                }
+
+                if (!$filename) {
+                        $filename = basename($path);
+                }
+
+                $destination = FILES . $model->field($this->settings['fields']['path']) . DS . $filename;
+
+                if (file_exists($destination)) {
+                        if (!unlink($destination)) {
+                                $this->errors[] = __('The destination path already exists and cannot be deleted.');
+                                return false;
+                        }
+                }
+
+                if (!file_exists(dirname($destination))) {
+                        if (!mkdir(dirname($destination), 0775, true)) {
+                                $this->errors[] = __('Could not create the destination directory.', true);
+                                return false;
+                        }
+                }
+
+                if ($move) {
+                        $result = rename($path, $destination);
+                } else {
+                        $result = copy($path, $destination);
+                }
+
+                if (!$result) {
+                        $this->errors = __('The file could not be copied or moved.');
+                        return false;
+                }
+
+                $model->set(array(
+                        $this->settings['fields']['filename'] => $filename,
+                        $this->settings['fields']['mimetype_id'] => $mimetype['Mimetype']['id'],
+                ));
+                
+                return true;
+        }
+
+        /**
          * Delete the currrent on-disk file, if any
          *
@@ -235 +300 @@
                 
                 if ($path = $this->getPath($model)) {
-                        return file_get_contents($this->settings['directory'] . DS . $path);
+                        return file_get_contents($path);
                 }
 
@@ -262 +327 @@
                 }
                 
-                if (!$path || !$filename || !is_file($this->settings['directory'] . DS . $path . DS . $filename)) {
+                if (!$path || !$filename || !is_file(FILES . $path . DS . $filename)) {
                         return false; // There is no file
                 }
 
-                return $this->settings['directory'] . DS . $path . DS . $filename;
+                return FILES . $path . DS . $filename;
         }
 
@@ -284 +349 @@
                 if (strpos($mimestring, ';') !== false) {
                         $mimestring = substr($mimestring, 0, strpos($mimestring, ';'));
+                }
+
+                if ($mimestring == 'application/zip') {
+                        // Guess from the extension
+                        $ext = substr($path, strrpos($path, '.') + 1);
+
+                        $mimetype = $model->Mimetype->find('first', array(
+                                'conditions' => array(
+                                        'Mimetype.extension' => $ext,
+                                ),
+                        ));
+
+                        return $mimetype;
                 }
 
@@ -308 +386 @@
 
         /**
-         * Abort the save if there were errors with the file records
-         *
-         * @param object $model A reference to the model
-         * @return True on success, false to abort the save
-         */
-        public function beforeSave(&$model)
-        {
-                if (!isset($model->data[$model->name][$this->settings['fields']['filename']])) {
-                        return true; // No file is being saved
-                }
-
-                $path = $this->getPath($model);
-                if ($path && !file_exists($path)) {
-                        $this->errors[] = __('The filename field is set but the file does not exist', true);
-                }
-
-                if (!empty($this->errors) && !$this->settings['saveOnError']) {
-                        return false;
-                }
-
-                return true;
-        }
-
-        /**
          * Delete the file when the record is deleted
          *

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

@@ -30 +30 @@
 
         /** @var string Every application supports a certain ODF doctype */
-        public $hasAndBelongsToMany = 'Request';
+        public $hasAndBelongsToMany = array('Request' => array('unique' => false));
+
+        /** Some galleries have a Testsuite */
+        public $hasOne = 'Testsuite';
 
         /** @var array The model behaviors */
@@ -90 +93 @@
 
         /**
+         * Count the number of requests in this gallery
+         * @param int $id The Gallery ID
+         * @param bool $recursive True to count requests in subgalleries as well
+         */
+        public function requestCount($id = null, $recursive = false)
+        {
+                if (!$id) {
+                        $id = $this->id;
+                }
+
+                if (!$id) {
+                        return 0;
+                }
+
+                $num_requests = $this->GalleriesRequest->find('count', array(
+                        'conditions' => array('gallery_id' => $id),
+                ));
+
+                if ($recursive) {
+                        $gallery = $this->read(null, $id);
+
+                        if (!$gallery['Gallery']['lft'] && !$gallery['Gallery']['rght']) {
+                                return $num_requests;
+                        }
+
+                        $num_documents = $this->Request->query('SELECT COUNT(*) as `count`
+                                FROM `requests` AS `Request`
+                                LEFT JOIN `galleries_requests` AS `GalleriesRequest`
+                                        ON `Request`.`id` = `GalleriesRequest`.`request_id`
+                                LEFT JOIN `galleries` AS `Gallery`
+                                        ON `GalleriesRequest`.`gallery_id` = `Gallery`.`id`
+                                WHERE
+                                        `Gallery`.`lft` > ' . $gallery['Gallery']['lft'] . '
+                                        AND `Gallery`.`rght` < ' . $gallery['Gallery']['rght']);
+                        $num_requests = $num_requests + $num_documents[0][0]['count'];
+                }
+
+                return $num_requests;
+        }
+
+        /**
          * Convert the Markdown description to HTML before saving
          * @return boolean True to continue saving

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

@@ -67 +67 @@
                 }
         }
+
+        /**
+         * Remove the result before removing the Job
+         */
+        public function beforeDelete($cascade)
+        {
+                $result_id = $this->field('result_id');
+
+                if ($result_id) {
+                        $this->Result->delete($result_id);
+                }
+
+                return true;
+        }
 }
 

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

@@ -47 +47 @@
 
         /** @var array Requests can belong to multiple galleries */
-        public $hasAndBelongsToMany = array('Gallery');
+        public $hasAndBelongsToMany = array('Gallery' => array('unique' => false));
 
         /** @var array Use the file behaviour to associate ODF files with Requests */
@@ -53 +53 @@
                 'Containable',
                 'BeanStalk.Deferrable',
-                'File' => 'files',
+                'File',
                 'Pipeline' => 'Preprocessor',
         );
@@ -210 +210 @@
 
         /**
+         * Delete all jobs and results belonging to the request
+         */
+        public function deleteJobs($id = null)
+        {
+                if (!$id) {
+                        $id = $this->id;
+                }
+
+                if (!$id) {
+                        return;
+                }
+
+                $request = $this->find('first', array(
+                        'contain' => array('Job'),
+                        'conditions' => array('Request.id' => $id),
+                ));
+
+                if (!$request || !isset($request['Job']) || empty($request['Job'])) {
+                        return;
+                }
+
+                foreach ($request['Job'] as $job) {
+                        $this->Job->delete($job['id']); // Results are deleted in Job::beforeDelete
+                }
+        }
+
+        /**
          * Generate a zipfile containing the original request and all results
          *
@@ -220 +247 @@
                 }
 
-                $root = $this->Behaviors->File->settings['directory'] . DS . $this->field('root');
+                $root = FILES . $this->field('root');
                 $filename = $this->field('filename');
                 $filename = substr($filename, 0, strrpos($filename, '.'));
@@ -272 +299 @@
                 }
 
+                $this->contain();
                 $this->read();
+
                 $clamd = new Clamd($clamd_config);
                 $path = $this->getPath();
@@ -318 +347 @@
         public function validateFile()
         {
+                $this->contain('Validator');
                 $this->read();
+
+                $this->errors = array();
                 if (!is_array($this->data['Validator'])) {
                         $this->log('No validators found for Request: ' . $this->id, LOG_DEBUG);

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

@@ -55 +55 @@
                 'Containable',
                 'BeanStalk.Deferrable',
-                'File' => 'files',
+                'File',
                 'Pipeline' => 'Postprocessor',
         );

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

@@ -39 +39 @@
         public function expire()
         {
-                App::import('Model', 'Request');
-                $Request = new Request();
+                $Request = ClassRegistry::init('Request');
 
                 if (!$Request->expireAll()) {
                         $this->log('Cron: Could not expire old requests.');
                 }
+        }
+
+        /**
+         * Update the test suites
+         */
+        public function syncTestsuites()
+        {
+                $Testsuite = ClassRegistry::init('Testsuite');
+                $Testsuite->synchronise();
         }
 
@@ -58 +66 @@
                 $this->out('Commands:');
                 $this->out("\n\texpire\n\t\tSet STATE_EXPIRED on all requests whose expiry time has passed.\n\t\tThis should be run every minute.");
+                $this->out("\n\tsyncTestsuites\n\t\tSynchronise all ODF testsuites.\n\t\tThis should be run every hour.");
                 $this->out("\n\thelp\n\t\tShow this help");
                 $this->out('');

trunk/server/www/app/views/elements/gallery.ctp

@@ -9 +9 @@
         <?php echo $this->element('gallery', array('gallery' => $child, 'indent' => $indent + 2)); ?>
 <?php endforeach;?>
+
+<?php if (isset($gallery['Request']) && is_array($gallery['Request'])):?>
 <?php foreach ($gallery['Request'] as $request):?>
         <tr class="request">
@@ -49 +51 @@
         <?php endforeach; ?>
 <?php endforeach; ?>
+<?php endif; ?>

trunk/server/www/app/views/galleries/view.ctp

@@ -14 +14 @@
 <div id="gallery-results" class="related">
         <h2><?php __('Documents');?></h2>
-        <?php if (!empty($gallery['Request'])):?>
         <table cellpadding = "0" cellspacing = "0">
         <tr>
@@ -25 +24 @@
         <?php echo $this->element('gallery', array('gallery' => $gallery, 'indent' => 0)); ?>
         </table>
-<?php endif; ?>
 </div>