mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-07 18:14:35 +00:00

Conflicts: CHANGELOG.md bin/console bin/developer bin/setup bower.json composer.json composer.lock features/bootstrap/FeatureContext.php features/bootstrap/GuiContext.php lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php lib/Alchemy/Phrasea/Command/CreateCollection.php lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Client/Baskets.php lib/Alchemy/Phrasea/Controller/Client/Root.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Property.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Controller/Prod/Tools.php lib/Alchemy/Phrasea/Controller/Prod/Upload.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php lib/Alchemy/Phrasea/Helper/DatabaseHelper.php lib/Alchemy/Phrasea/Helper/User/Edit.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/Doctrine/Entities/AuthFailure.php lib/Doctrine/Entities/Basket.php lib/Doctrine/Entities/BasketElement.php lib/Doctrine/Entities/LazaretAttribute.php lib/Doctrine/Entities/LazaretCheck.php lib/Doctrine/Entities/LazaretFile.php lib/Doctrine/Entities/LazaretSession.php lib/Doctrine/Entities/Session.php lib/Doctrine/Entities/SessionModule.php lib/Doctrine/Entities/StoryWZ.php lib/Doctrine/Entities/UsrList.php lib/Doctrine/Entities/UsrListEntry.php lib/Doctrine/Entities/UsrListOwner.php lib/Doctrine/Entities/ValidationData.php lib/Doctrine/Entities/ValidationParticipant.php lib/Doctrine/Entities/ValidationSession.php lib/Doctrine/Logger/MonologSQLLogger.php lib/Doctrine/Repositories/BasketRepository.php lib/Doctrine/Repositories/ValidationParticipantRepository.php lib/Doctrine/Types/Binary.php lib/Doctrine/Types/Blob.php lib/Doctrine/Types/Enum.php lib/Doctrine/Types/LongBlob.php lib/Doctrine/Types/VarBinary.php lib/classes/API/OAuth2/Account.php lib/classes/API/OAuth2/Application.php lib/classes/API/OAuth2/Application/OfficePlugin.php lib/classes/API/OAuth2/AuthCode.php lib/classes/API/OAuth2/RefreshToken.php lib/classes/API/OAuth2/Token.php lib/classes/API/V1/Abstract.php lib/classes/API/V1/Interface.php lib/classes/API/V1/adapter.php lib/classes/API/V1/exception/abstract.php lib/classes/API/V1/exception/badrequest.php lib/classes/API/V1/exception/forbidden.php lib/classes/API/V1/exception/internalservererror.php lib/classes/API/V1/exception/maintenance.php lib/classes/API/V1/exception/methodnotallowed.php lib/classes/API/V1/exception/notfound.php lib/classes/API/V1/exception/unauthorized.php lib/classes/API/V1/result.php lib/classes/Exception/Feed/EntryNotFound.php lib/classes/Exception/Feed/ItemNotFound.php lib/classes/Exception/Feed/PublisherNotFound.php lib/classes/Feed/Abstract.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/CollectionInterface.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Collection.php lib/classes/Feed/Entry/CollectionInterface.php lib/classes/Feed/Entry/Interface.php lib/classes/Feed/Entry/Item.php lib/classes/Feed/Entry/ItemInterface.php lib/classes/Feed/Interface.php lib/classes/Feed/Link.php lib/classes/Feed/LinkInterface.php lib/classes/Feed/Publisher/Adapter.php lib/classes/Feed/Publisher/Interface.php lib/classes/Feed/Token.php lib/classes/Feed/TokenAggregate.php lib/classes/Feed/XML/Abstract.php lib/classes/Feed/XML/Atom.php lib/classes/Feed/XML/Cooliris.php lib/classes/Feed/XML/Interface.php lib/classes/Feed/XML/RSS.php lib/classes/Feed/XML/RSS/Image.php lib/classes/Feed/XML/RSS/ImageInterface.php lib/classes/User/Adapter.php lib/classes/User/Interface.php lib/classes/appbox/register.php lib/classes/connection.php lib/classes/connection/abstract.php lib/classes/connection/interface.php lib/classes/connection/pdo.php lib/classes/connection/pdoStatementDebugger.php lib/classes/deprecated/countries.php lib/classes/deprecated/inscript.api.php lib/classes/eventsmanager/event/test.php lib/classes/ftpclient.php lib/classes/http/request.php lib/classes/media/subdef.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskState.php lib/classes/module/console/tasklist.php lib/classes/module/console/taskrun.php lib/classes/patch/320alpha4b.php lib/classes/patch/3715alpha1a.php lib/classes/patch/379alpha1a.php lib/classes/patch/380alpha10a.php lib/classes/patch/380alpha11a.php lib/classes/patch/380alpha13a.php lib/classes/patch/380alpha14a.php lib/classes/patch/380alpha15a.php lib/classes/patch/380alpha16a.php lib/classes/patch/380alpha17a.php lib/classes/patch/380alpha18a.php lib/classes/patch/380alpha3a.php lib/classes/patch/380alpha4a.php lib/classes/patch/380alpha6a.php lib/classes/patch/380alpha8a.php lib/classes/patch/380alpha9a.php lib/classes/patch/381alpha1b.php lib/classes/patch/381alpha2a.php lib/classes/patch/381alpha3a.php lib/classes/patch/381alpha4a.php lib/classes/patch/383alpha1a.php lib/classes/patch/383alpha2a.php lib/classes/patch/383alpha3a.php lib/classes/patch/383alpha4a.php lib/classes/record/adapter.php lib/classes/record/preview.php lib/classes/recordutils.php lib/classes/recordutils/audio.php lib/classes/recordutils/document.php lib/classes/recordutils/map.php lib/classes/recordutils/video.php lib/classes/registry.php lib/classes/registryInterface.php lib/classes/set/order.php lib/classes/system/url.php lib/classes/task/Scheduler.php lib/classes/task/appboxAbstract.php lib/classes/task/databoxAbstract.php lib/classes/task/manager.php lib/classes/task/period/RecordMover.php lib/classes/task/period/apibridge.php lib/classes/task/period/apiwebhooks.php lib/classes/task/period/archive.php lib/classes/task/period/cindexer.php lib/classes/task/period/emptyColl.php lib/classes/task/period/ftp.php lib/classes/task/period/ftpPull.php lib/classes/task/period/subdef.php lib/classes/task/period/test.php lib/classes/task/period/writemeta.php lib/conf.d/PhraseaFixture/AbstractWZ.php lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php lib/conf.d/PhraseaFixture/Story/LoadOneStory.php lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php lib/conf.d/PhraseaFixture/UsrLists/UsrList.php lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php templates/web/admin/collection/collection.html.twig templates/web/common/dialog_export.html.twig templates/web/common/menubar.html.twig templates/web/prod/actions/Tools/index.html.twig templates/web/prod/index.html.twig templates/web/prod/upload/upload-flash.html.twig templates/web/prod/upload/upload.html.twig templates/web/report/report_layout_child.html.twig templates/web/setup/step2.html.twig templates/web/thesaurus/new-synonym-dialog.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
159 lines
6.2 KiB
PHP
159 lines
6.2 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of Phraseanet
|
|
*
|
|
* (c) 2005-2015 Alchemy
|
|
*
|
|
* For the full copyright and license information, please view the LICENSE
|
|
* file that was distributed with this source code.
|
|
*/
|
|
|
|
use Doctrine\DBAL\Driver\Connection;
|
|
|
|
class patchthesaurus_204 implements patchthesaurus_interface
|
|
{
|
|
public function patch($version, \DOMDocument $domct, \DOMDocument $domth, Connection $connbas, \unicode $unicode)
|
|
{
|
|
$needreindex = false;
|
|
|
|
if ($version == "2.0.4") {
|
|
$xp = new DOMXPath($domth);
|
|
$sy = $xp->query("//sy");
|
|
for ($i = 0; $i < $sy->length; $i ++) {
|
|
if (($k = $sy->item($i)->getAttribute("k"))) {
|
|
$v = $sy->item($i)->getAttribute("v");
|
|
if (strpos($v, "(") === false) {
|
|
$sy->item($i)->setAttribute("v", $v . " (" . $k . ")");
|
|
printf("// context '($k)' pasted to value '$v'\n");
|
|
$needreindex = true;
|
|
} else {
|
|
printf("// <font color=\"#ff8000\">warning</font> : <sy id='%s' v='%s' ...> already had context (left unchanged)\n", $sy->item($i)->getAttribute("id"), htmlentities($v));
|
|
}
|
|
|
|
$newk = trim($unicode->remove_indexer_chars($k));
|
|
if ($newk != $k) {
|
|
$sy->item($i)->setAttribute("k", $newk);
|
|
$needreindex = true;
|
|
}
|
|
}
|
|
}
|
|
$domth->documentElement->setAttribute("version", "2.0.5");
|
|
$domth->documentElement->setAttribute("modification_date", date("YmdHis"));
|
|
|
|
if ($needreindex) {
|
|
print("// need to reindex, deleting cterms (keeping rejected)\n");
|
|
|
|
$xp = new DOMXPath($domct);
|
|
|
|
$nodes = $xp->query("//te[not(starts-with(@id, 'R')) and count(te[starts-with(@id, 'R')])=0]");
|
|
$nodestodel = [];
|
|
for ($i = 0; $i < $nodes->length; $i ++ )
|
|
$nodestodel[] = $nodes->item($i);
|
|
$ctdel = 0;
|
|
foreach ($nodestodel as $node) {
|
|
$sql2 = "DELETE FROM thit WHERE value LIKE :like";
|
|
|
|
$stmt = $connbas->prepare($sql2);
|
|
$stmt->execute([':like' => str_replace(".", "d", $node->getAttribute("id")) . "d%"]);
|
|
$stmt->closeCursor();
|
|
|
|
$node->parentNode->removeChild($node);
|
|
$ctdel ++;
|
|
}
|
|
print("// $ctdel nodes removed\n");
|
|
|
|
$sql2 = "UPDATE record SET status=((status | 15) & ~2)";
|
|
|
|
$stmt = $connbas->prepare($sql2);
|
|
$stmt->execute();
|
|
$stmt->closeCursor();
|
|
}
|
|
|
|
$sy = $xp->query("//sy");
|
|
for ($i = 0; $i < $sy->length; $i ++) {
|
|
if (($k = $sy->item($i)->getAttribute("k"))) {
|
|
if (strpos($v = $sy->item($i)->getAttribute("v"), "(") === false) {
|
|
$sy->item($i)->setAttribute("v", $v . " (" . $k . ")");
|
|
} else {
|
|
printf("// <font color=\"#ff8000\">warning</font> : <sy id='%s' v='%s' ...> already had context (left unchanged)\n", $sy->item($i)->getAttribute("id"), htmlentities($v));
|
|
}
|
|
$sy->item($i)->setAttribute("k", $unicode->remove_indexer_chars($k));
|
|
}
|
|
}
|
|
|
|
$domct->documentElement->removeAttribute("id");
|
|
|
|
$this->fixRejected($connbas, $domct->documentElement, false);
|
|
|
|
$this->fixIds($connbas, $domct->documentElement);
|
|
|
|
$domct->documentElement->setAttribute("version", "2.0.5");
|
|
$domct->documentElement->setAttribute("modification_date", date("YmdHis"));
|
|
|
|
$version = "2.0.5";
|
|
}
|
|
|
|
return($version);
|
|
}
|
|
|
|
public function fixRejected(Connection &$connbas, &$node, $rejected)
|
|
{
|
|
if ($node->nodeType != XML_ELEMENT_NODE) {
|
|
return;
|
|
}
|
|
|
|
$id = $node->getAttribute("id");
|
|
|
|
if (substr($id, 0, 1) == "R") {
|
|
$rejected = true;
|
|
}
|
|
|
|
if ($rejected) {
|
|
$newid = "R" . substr($id, 1);
|
|
if ($newid != $id) {
|
|
print("// \tid '$id' (child of '" . $node->parentNode->getAttribute("id") . "') fixed to '$newid'\n");
|
|
$node->setAttribute("id", $newid);
|
|
$id = str_replace(".", "d", $id) . "d";
|
|
$newid = str_replace(".", "d", $newid) . "d";
|
|
$sql = "UPDATE thit SET value = :newid WHERE value = :oldid";
|
|
|
|
$stmt = $connbas->prepare($sql);
|
|
$stmt->execute([':newid' => $newid, ':oldid' => $id]);
|
|
$stmt->closeCursor();
|
|
}
|
|
}
|
|
for ($n = $node->firstChild; $n; $n = $n->nextSibling)
|
|
$this->fixRejected($connbas, $n, $rejected);
|
|
}
|
|
|
|
public function fixIds(Connection $connbas, &$node)
|
|
{
|
|
if ($node->nodeType != XML_ELEMENT_NODE) {
|
|
return;
|
|
}
|
|
|
|
if ($node->parentNode && $node->parentNode->nodeType == XML_ELEMENT_NODE) {
|
|
$pid = $node->parentNode->getAttribute("id");
|
|
if ($pid != "") {
|
|
$id = $node->getAttribute("id");
|
|
if (substr($id, 1, strlen($pid)) != substr($pid, "1") . ".") {
|
|
$nid = $node->parentNode->getAttribute("nextid");
|
|
$node->parentNode->setAttribute("nextid", $nid + 1);
|
|
$node->setAttribute("id", $newid = ($pid . "." . $nid));
|
|
printf("// \tid '%s' (child of '%s') fixed to '%s'\n", $id, $pid, $newid);
|
|
$id = str_replace(".", "d", $id) . "d";
|
|
$newid = str_replace(".", "d", $newid) . "d";
|
|
$sql = "UPDATE thit SET value = :newid WHERE value = :oldid";
|
|
|
|
$stmt = $connbas->prepare($sql);
|
|
$stmt->execute([':newid' => $newid, ':oldid' => $id]);
|
|
$stmt->closeCursor();
|
|
}
|
|
}
|
|
}
|
|
for ($n = $node->firstChild; $n; $n = $n->nextSibling)
|
|
$this->fixIds($connbas, $n);
|
|
}
|
|
}
|