hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from jygaulier/fix_1073_1074

Browse Source 
[3.8] Fix 1073 1074
This commit is contained in:
Romain Neutron
2013-01-17 07:42:29 -08:00
parent 658b9d3222 25c4c76a24
commit 68a4740df8
3 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/databox.class.php
View File

@@ -977,8 +977,8 @@ class databox extends base
$dom = new DOMDocument(); $dom = new DOMDocument();
if ($thesaurus && false !== $tmp = $dom->loadXML($thesaurus)) { if ($thesaurus && false !== $dom->loadXML($thesaurus)) {
self::$_dom_thesaurus[$sbas_id] = $tmp; self::$_dom_thesaurus[$sbas_id] = $dom;
} else { } else {
self::$_dom_thesaurus[$sbas_id] = false; self::$_dom_thesaurus[$sbas_id] = false;
unset($dom); unset($dom);

76
tests/Alchemy/Phrasea/Controller/Admin/DataboxTest.php
View File

@@ -645,4 +645,80 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$this->fail('Task for empty collection has not been created'); $this->fail('Task for empty collection has not been created');
} }
} }
/**
* @covers \Alchemy\Phrasea\Controller\Admin\Database::saveThesaurus
* @covers \Alchemy\Phrasea\Controller\Admin\Database::get_thesaurus
* @covers \Alchemy\Phrasea\Controller\Admin\Database::get_dom_thesaurus
*/
public function test_get_thesaurus()
{
$testValue = rand(1000, 9999);
$xmlth = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
. "<thesaurus version=\"2.0.5\" creation_date=\"20100101000000\" modification_date=\"20100101000000\" nextid=\"4\">"
. "<testnode value=\"" . $testValue . "\"/>"
. "</thesaurus>\n";
$dom = new DOMDocument('1.0', 'UTF-8');
$dom->loadXML($xmlth);
$databox = $this->createDatabox();
$databox->saveThesaurus($dom);
// get back as xml text
$newxml = $databox->get_thesaurus();
// xml must be ok
$this->assertTrue($dom->loadXML($newxml));
// xml must match but with updated date
$this->assertTrue("20100101000000" != $dom->documentElement->getAttribute("modification_date"));
// check xml was saved
$this->assertTrue($testValue == $dom->documentElement->firstChild->getAttribute("value"));
// get back as dom
$newdom = $databox->get_dom_thesaurus();
$this->assertTrue("20100101000000" != $newdom->documentElement->getAttribute("modification_date"));
$this->assertTrue($testValue == $newdom->documentElement->firstChild->getAttribute("value"));
/**
* @todo : check results with bad thesaurus
*/
}
/**
* @covers \Alchemy\Phrasea\Controller\Admin\Database::saveCterms
* @covers \Alchemy\Phrasea\Controller\Admin\Database::get_cterms
* @covers \Alchemy\Phrasea\Controller\Admin\Database::get_dom_cterms
*/
public function test_get_cterms()
{
$testValue = rand(1000, 9999);
$xmlth = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
. "<cterms version=\"2.0.5\" creation_date=\"20100101000000\" modification_date=\"20100101000000\" nextid=\"4\">"
. "<testnode value=\"" . $testValue . "\"/>"
. "</cterms>\n";
$dom = new DOMDocument('1.0', 'UTF-8');
$dom->loadXML($xmlth);
$databox = $this->createDatabox();
$databox->saveCterms($dom);
// get back as xml text
$newxml = $databox->get_cterms();
// xml must be ok
$this->assertTrue($dom->loadXML($newxml));
// xml must match but with updated date
$this->assertTrue("20100101000000" != $dom->documentElement->getAttribute("modification_date"));
// check xml was saved
$this->assertTrue($testValue == $dom->documentElement->firstChild->getAttribute("value"));
// get back as dom
$newdom = $databox->get_dom_cterms();
$this->assertTrue("20100101000000" != $newdom->documentElement->getAttribute("modification_date"));
$this->assertTrue($testValue == $newdom->documentElement->firstChild->getAttribute("value"));
/**
* @todo : check results with bad cterms
*/
}
} }

8
www/.htaccess
View File

@@ -1,9 +1,9 @@
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
RewriteRule ^include/minify/([a-z]=.*) /include/minify/index.php?$1 [L,NE] RewriteRule ^include/minify/([a-z]=.*) /include/minify/index.ph?$1 [L,NE]
RewriteRule ^lightbox/.?$ /index.php [L] RewriteRule ^lightbox/.*$ /index.php [L]
RewriteRule ^admin/.?$ /index.php [L] RewriteRule ^admin/.*$ /index.php [L]
RewriteRule ^permalink/.*$ /index.php [L] RewriteRule ^permalink/.*$ /index.php [L]
RewriteRule ^datafiles/.*$ /index.php [L] RewriteRule ^datafiles/.*$ /index.php [L]
RewriteRule ^robots.txt$ /index.php [L] RewriteRule ^robots.txt$ /index.php [L]
@@ -25,7 +25,7 @@
RewriteRule ^prod/push/.*$ /index.php [L] RewriteRule ^prod/push/.*$ /index.php [L]
RewriteRule ^prod/printer/.*$ /index.php [L] RewriteRule ^prod/printer/.*$ /index.php [L]
RewriteRule ^prod/story/.*$ /index.php [L] RewriteRule ^prod/story/.*$ /index.php [L]
RewriteRule ^prod/TOU/.?$ /index.php [L] RewriteRule ^prod/TOU/.*$ /index.php [L]
RewriteRule ^prod/WorkZone/.*$ /index.php [L] RewriteRule ^prod/WorkZone/.*$ /index.php [L]
RewriteRule ^prod/language/.*$ /index.php [L] RewriteRule ^prod/language/.*$ /index.php [L]
RewriteRule ^prod/tools/.*$ /index.php [L] RewriteRule ^prod/tools/.*$ /index.php [L]