From: <min...@us...> - 2006-05-08 23:59:20
|
Revision: 13611 Author: mindless Date: 2006-05-07 16:14:03 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/gallery/?rev=13611&view=rev Log Message: ----------- omit ".svn" instead of "CVS" during add-dir so unit tests pass Modified Paths: -------------- trunk/gallery2/modules/core/ItemAddFromServer.inc trunk/gallery2/modules/core/test/phpunit/ItemAddFromServerTest.class Modified: trunk/gallery2/modules/core/ItemAddFromServer.inc =================================================================== --- trunk/gallery2/modules/core/ItemAddFromServer.inc 2006-05-07 20:41:10 UTC (rev 13610) +++ trunk/gallery2/modules/core/ItemAddFromServer.inc 2006-05-07 23:14:03 UTC (rev 13611) @@ -138,7 +138,7 @@ return array($ret, null, null); } } - + return array(null, $error, $status); } @@ -232,7 +232,7 @@ $dirList = $albumList = array(); $handle = $this->_platform->opendir($path); while (($fileName = $this->_platform->readdir($handle)) !== false) { - if ($fileName == '.' || $fileName == '..' || $fileName == 'CVS') { + if ($fileName == '.' || $fileName == '..' || $fileName == '.svn') { continue; } $dirList[] = $fileName; @@ -331,7 +331,7 @@ /* Look up the platform type */ $platform =& $gallery->getPlatform(); $slash = $platform->getDirectorySeparator(); - + if (isset($form['action']['startOver'])) { $form['localServerFiles'] = array(); } else if (isset($form['action']['findFilesFromLocalServer'])) { @@ -349,7 +349,7 @@ GalleryUtilities::unsanitizeInputValues($localServerPath, false); $localServerPath = $platform->realpath($localServerPath); $form['localServerPath'] = GalleryCoreApi::convertToUtf8($localServerPath); - + /* Validate the path */ $form['localServerFiles'] = array(); if (empty($localServerPath)) { @@ -380,7 +380,7 @@ continue; } $filePath = $path . $slash . $fileName; - + if ($platform->is_readable($filePath)) { if ($platform->is_dir($filePath)) { $filePath = $platform->realpath($filePath); Modified: trunk/gallery2/modules/core/test/phpunit/ItemAddFromServerTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/ItemAddFromServerTest.class 2006-05-07 20:41:10 UTC (rev 13610) +++ trunk/gallery2/modules/core/test/phpunit/ItemAddFromServerTest.class 2006-05-07 23:14:03 UTC (rev 13611) @@ -250,7 +250,7 @@ if ($addDirectories) { $files = array('test1.gif', 'test1.jpg', 'test2.gif', 'test[3].gif', 'test4.gif'); rsort($files); - + $escapedBasenames = array('test1', 'test1', 'test2', 'test[3]', 'test4'); rsort($escapedBasenames); @@ -265,7 +265,7 @@ GalleryUtilities::putRequestVariable( 'form[localServerDirectories][..][useSymlink]', 1); } - } + } GalleryUtilities::putRequestVariable('form[localServerPath]', GalleryCoreApi::convertToUtf8($baseDir)); @@ -315,7 +315,7 @@ } $addDirectoriesString = $addDirectories ? ' addDirectories' : ' !addDirectories'; $this->assertEquals(count($files), count($ids), 'child count' . $addDirectoriesString); - + list ($ret, $items) = GalleryCoreApi::loadEntitiesById($ids); if ($ret) { return $this->failWithStatus($ret); @@ -327,7 +327,7 @@ $newItems[$item->getId()] = $item; } $items = $newItems; - + $seenWeights = array(); $i = 0; foreach ($escapedBasenames as $base) { @@ -515,7 +515,7 @@ $source = $this->_baseDir . 'test1.jpg'; break; } - + if ( $this->_delegate->isSymlinkSupported() == true ) { return $this->_delegate->symlink($source, $dest); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |