Changeset 321 for trunk

Timestamp:

03/16/10 12:47:03 (11 years ago)

Author:

sander

Message:

Cleaner import of the Fellowship testsuite

Location:

trunk/server/www/app/models

Files:

• gallery.php (modified) (1 diff)
• testsuite.php (modified) (3 diffs)

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

@@ -347 +347 @@
 
                         foreach ($jobs as $job) {
+                                if (empty($job['Job'])) { // When a testsuite request has no jobs yet
+                                        continue;
+                                }
+
                                 $application = $job['Job']['application_id'];
                                 if (!isset($versions[$application])) {

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

@@ -103 +103 @@
                 $directories = glob(FILES . $path . DS . '*', GLOB_NOSORT | GLOB_ONLYDIR);
                 foreach ($directories as $directory) {
-                        // Skip testDoc directories in the Fellowship
-                        if (strtolower(substr($directory, -7)) == 'testdoc') {
-                                $this->_syncDirectory($path . DS . basename($directory), $root, $gallery_id);
-                                return;
-                        }
-
+                        // Skip testDoc directories in the Fellowship test suite
+                        if (is_dir($directory . DS . 'testDoc')) {
+                                $this->_syncDirectory($path . DS . basename($directory) . DS . 'testDoc', $root, $gallery_id);
+                                continue;
+                        }
+                        
+                        if (is_dir($directory . DS . 'testdoc')) {
+                                $this->_syncDirectory($path . DS . basename($directory) . DS . 'testdoc', $root, $gallery_id);
+                                continue;
+                        }
+
+                        // See if a gallery exists
                         $gallery_name = basename($directory);
                         $gallery = $this->Gallery->find('first', array(
@@ -170 +176 @@
                 $filename = basename($path);
                 if (strtolower(substr($filename, 0, 8)) == 'testdoc.') {
-                        $filename  = $gallery['Gallery']['name'];
+                        // Rename to parent directory. If that is testDoc too, rename to grandparent
+                        $filename  = dirname($path);
+                        if (strtolower(substr($filename, -7)) == 'testdoc') {
+                                $filename  = dirname($filename);
+                        }
+
+                        $filename  = basename($filename);
                         $filename .= strrchr($path, '.');
                 }
@@ -224 +236 @@
                         return;
                 }
-
+                
                 // See if the request needs updating
                 if (strtotime($request['Request']['modified']) < filemtime($path)) {