Merge branch '3.8'

Conflicts: composer.json composer.lock config/configuration.sample.yml lib/Alchemy/Phrasea/Application.php lib/Alchemy/Phrasea/Application/Api.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Users.php lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Language.php lib/Alchemy/Phrasea/Controller/Prod/Push.php lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php lib/Alchemy/Phrasea/Controller/Report/Informations.php lib/Alchemy/Phrasea/Controller/Report/Root.php lib/Alchemy/Phrasea/Controller/Root/Developers.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Root/Session.php lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php lib/classes/API/OAuth2/Application.php lib/classes/API/V1/adapter.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/Entry/Adapter.php lib/classes/ZipArchiveImproved.php lib/classes/caption/Field/Value.php lib/classes/caption/record.php lib/classes/eventsmanager/notify/feed.php lib/classes/media/subdef.php lib/classes/module/report/connexion.php lib/classes/module/report/download.php lib/classes/record/adapter.php lib/classes/registry.php lib/classes/set/export.php lib/classes/setup.php lib/classes/task/abstract.php lib/classes/task/period/emptyColl.php lib/classes/uuid.php lib/conf.d/_GV_template.inc lib/conf.d/bases_structure.xml lib/conf.d/configuration.yml lib/conf.d/minifyGroupsConfig.php locale/de_DE/LC_MESSAGES/phraseanet.mo locale/de_DE/LC_MESSAGES/phraseanet.po locale/en_GB/LC_MESSAGES/phraseanet.mo locale/en_GB/LC_MESSAGES/phraseanet.po locale/fr_FR/LC_MESSAGES/phraseanet.mo locale/fr_FR/LC_MESSAGES/phraseanet.po locale/nl_NL/LC_MESSAGES/phraseanet.mo locale/nl_NL/LC_MESSAGES/phraseanet.po locale/phraseanet.pot templates/web/account/account.html.twig templates/web/account/base.html.twig templates/web/admin/databox/databox.html.twig templates/web/admin/index.html.twig templates/web/admin/setup.html.twig templates/web/admin/tree.html.twig templates/web/client/index.html.twig templates/web/common/caption.html.twig templates/web/common/caption_templates/answer.html.twig templates/web/common/caption_templates/basket_element.html.twig templates/web/common/caption_templates/internal_publi.html.twig templates/web/common/caption_templates/lazaret.html.twig templates/web/common/caption_templates/overview.html.twig templates/web/common/caption_templates/preview.html.twig templates/web/common/index_bootstrap.html.twig templates/web/common/indexfloat.html.twig templates/web/common/thumbnail.html.twig templates/web/developers/application_form.html.twig templates/web/lightbox/IE6/feed.html.twig templates/web/lightbox/IE6/validate.html.twig templates/web/lightbox/feed.html.twig templates/web/lightbox/validate.html.twig templates/web/prod/actions/Download/prepare.html.twig templates/web/prod/actions/publish/publish.html.twig templates/web/prod/index.html.twig templates/web/prod/preview/caption.html.twig templates/web/prod/results/answerlist.html.twig templates/web/thesaurus/accept.html.twig templates/web/thesaurus/export-text-dialog.html.twig templates/web/thesaurus/export-text.html.twig templates/web/thesaurus/export-topics-dialog.html.twig templates/web/thesaurus/export-topics.html.twig templates/web/thesaurus/index.html.twig templates/web/thesaurus/link-field-step1.html.twig templates/web/thesaurus/link-field-step2.html.twig templates/web/thesaurus/link-field-step3.html.twig templates/web/thesaurus/new-term.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig templates/web/thesaurus/thesaurus.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php tests/classes/Feed/Feed_AggregateTest.php tests/classes/PhraseanetPHPUnitAbstract.php tests/db-ref.sqlite
2025-10-17 06:53:15 +00:00 · 2014-06-17 15:30:41 +02:00
parent b92370cca2 a87c5bb8e4
commit a8da584666
146 changed files with 5549 additions and 1054 deletions
--- a/lib/classes/caption/Field/ThesaurusValue.php
+++ b/lib/classes/caption/Field/ThesaurusValue.php
@@ -9,7 +9,7 @@
 * file that was distributed with this source code.
 */

-class ThesaurusValue
+class caption_Field_ThesaurusValue
 {
    /** @var string */
    private $value;
--- a/lib/classes/caption/Field/Value.php
+++ b/lib/classes/caption/Field/Value.php
@@ -51,7 +51,20 @@ class caption_Field_Value implements cache_cacheableInterface
    protected $record;
    protected $app;

-    protected static $localCache = [];
+    /**
+     * Query to ask to the search engine to bounce to the current value;
+     * This property is set if the value is matched against a thesaurus value;
+     *
+     * @var string
+     */
+    protected $qjs;
+
+    /**
+     * Tells whether the value is matched against a thesaurus value.
+     */
+    protected $isThesaurusValue;
+
+    protected static $localCache = array();

    /**
     *
@@ -71,6 +84,11 @@ class caption_Field_Value implements cache_cacheableInterface
        $this->retrieveValues();
    }

+    public function getQjs()
+    {
+        return $this->qjs;
+    }
+
    protected function retrieveValues()
    {
        try {
@@ -336,7 +354,6 @@ class caption_Field_Value implements cache_cacheableInterface
    public function highlight_thesaurus()
    {
        $value = $this->getValue();
-
        $databox = $this->databox_field->get_databox();
        $XPATH_thesaurus = $databox->get_xpath_thesaurus();

@@ -374,18 +391,33 @@ class caption_Field_Value implements cache_cacheableInterface
            if($context_noacc != "")
                $note += ($node->getAttribute("k") == $context_noacc) ? 1 : 0;
            if ($note > $bestnote) {
-                $bestnote = $note;
                $bestnode = $node;
            }
        }
-        if ($bestnode) {
-            list($term, $context) = $this->splitTermAndContext(str_replace(["[[em]]", "[[/em]]"], ["", ""], $value));
-            $qjs = $term . ($context ? '['.$context.']' : '');

-            $value = new ThesaurusValue($bestnode->getAttribute('v'), $this->databox_field, $qjs);
+        if ($bestnode) {
+            list($term, $context) = $this->splitTermAndContext(str_replace(array("[[em]]", "[[/em]]"), array("", ""), $value));
+            // a value has been found in thesaurus, update value & set the query to bounce to the value
+            $this->value = $bestnode->getAttribute('v');
+            $this->qjs = $term . ($context ? '['.$context.']' : '');
+            $this->isThesaurusValue = true;
+        } else {
+            $this->isThesaurusValue = false;
        }

-        return $value;
+        return $this;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isThesaurusValue()
+    {
+        if (null === $this->isThesaurusValue) {
+            $this->highlight_thesaurus();
+        }
+
+        return $this->isThesaurusValue;
    }

    /**
@@ -466,6 +498,11 @@ class caption_Field_Value implements cache_cacheableInterface
        unset(self::$localCache[$this->get_cache_key($option)]);
    }

+    public function __toString()
+    {
+        return $this->value;
+    }
+
    public static function purge()
    {
        self::$localCache = [];
--- a/lib/classes/caption/field.php
+++ b/lib/classes/caption/field.php
@@ -197,27 +197,27 @@ class caption_field implements cache_cacheableInterface
     *
     * @return mixed
     */
-    public function get_serialized_values($custom_separator = false, $highlightTheso = false)
+    public function get_serialized_values($custom_separator = false, $highlight = false)
    {
-        if ($this->databox_field->is_multi() === true) {
-            if ($custom_separator !== false)
-                $separator = $custom_separator;
-            else
-                $separator = $this->databox_field->get_separator();
-
-            return self::serialize_value($this->values, $separator, $highlightTheso);
-        } else {
-            foreach ($this->values as $value) {
-                /* @var $value Caption_Field_Value */
-                if ($highlightTheso) {
-                    return $value->highlight_thesaurus();
-                } else {
-                    return $value->getValue();
-                }
-            }
+        if (0 === count($this->values)) {
+            return null;
        }

-        return null;
+        if ($this->is_multi()) {
+            $separator = $custom_separator !== false ? $custom_separator : $this->databox_field->get_separator();
+
+            return self::serialize_value($this->values, $separator, $highlight);
+        }
+
+        $value = current($this->values);
+
+            /* @var $value Caption_Field_Value */
+        if ($highlight) {
+            return $value->highlight_thesaurus();
+        }
+
+        return $value->getValue();
+
    }

    /**
@@ -256,17 +256,6 @@ class caption_field implements cache_cacheableInterface
        return $this->databox_field;
    }

-    /**
-     *
-     * @return string
-     */
-    public function highlight_thesaurus()
-    {
-        $value = $this->get_serialized_values(false, true);
-
-        return $value;
-    }
-
    /**
     *
     * @param  string $serialized_value
--- a/lib/classes/caption/record.php
+++ b/lib/classes/caption/record.php
@@ -174,55 +174,40 @@ class caption_record implements caption_interface, cache_cacheableInterface
     */
    public function get_highlight_fields($highlight = '', Array $grep_fields = null, SearchEngineInterface $searchEngine = null, $includeBusiness = false, SearchEngineOptions $options = null)
    {
-        return $this->highlight_fields($highlight, $grep_fields, $searchEngine, $includeBusiness, $options);
-    }
-
-    /**
-     * @todo move this fun in caption_field object
-     * @param  string                $highlight
-     * @param  array                 $grep_fields
-     * @param  SearchEngineInterface $searchEngine
-     * @return array
-     */
-    protected function highlight_fields($highlight, Array $grep_fields = null, SearchEngineInterface $searchEngine = null, $includeBusiness = false, SearchEngineOptions $options = null)
-    {
-        $fields = [];
+        $fields = array();

        foreach ($this->get_fields($grep_fields, $includeBusiness) as $meta_struct_id => $field) {
-
-            $value = preg_replace(
-                "(([^']{1})((https?|file):((/{2,4})|(\\{2,4}))[\w:#%/;$()~_?/\-=\\\.&]*)([^']{1}))"
-                , '$1 $2 <a title="' . $this->app->trans('Open the URL in a new window') . '" class="ui-icon ui-icon-extlink" href="$2" style="display:inline;padding:2px 5px;margin:0 4px 0 2px;" target="_blank"> &nbsp;</a>$7'
-                , $highlight ? $field->highlight_thesaurus() : $field->get_serialized_values(false, false)
-            );
-
-            $fields[$field->get_name()] = [
-                'value'     => $value,
-                /** @Ignore */
-                'label'     => $field->get_databox_field()->get_label($this->app['locale']),
+            $values = array();
+            foreach ($field->get_values() as $metaId => $v) {
+                $values[$metaId] = array(
+                    'value' => $v->getValue(),
+                    'from_thesaurus' => $highlight ? $v->isThesaurusValue() : false,
+                    'qjs' => $v->getQjs(),
+                 );
+            }
+            $fields[$field->get_name()] = array(
+                'values'    => $values,
+                'name'      => $field->get_name(),
+                'label'     => $field->get_databox_field()->get_label($this->app['locale.I18n']),
                'separator' => $field->get_databox_field()->get_separator(),
-            ];
+                'sbas_id'   => $field->get_databox_field()->get_databox()->get_sbas_id()
+            );
        }

        if ($searchEngine instanceof SearchEngineInterface) {
            $ret = $searchEngine->excerpt($highlight, $fields, $this->record, $options);

+            // sets highlighted value from search engine, highlighted values will now
+            // be surrounded by [[em]][[/em]] tags
            if ($ret) {
-                $n = -1;
-
                foreach ($fields as $key => $value) {
-                    $n++;
-
-                    if (!isset($fields[$key])) {
+                    if (!isset($ret[$key])) {
                        continue;
                    }

-                    if (strpos($fields[$key]['value'], '<a class="bounce" ') !== false) {
-                        continue;
+                    foreach ($ret[$key] as $metaId => $newValue) {
+                        $fields[$key]['values'][$metaId]['value'] = $newValue;
                    }
-
-                    //if(strpos($fields[$key]['value'], '<a ') === false)
-                    $fields[$key]['value'] = $ret[$n];
                }
            }
        }