diff --git a/lib/Alchemy/Phrasea/Command/BuildSubdefs.php b/lib/Alchemy/Phrasea/Command/BuildSubdefs.php index bc8bc777df..e7fbf73b42 100644 --- a/lib/Alchemy/Phrasea/Command/BuildSubdefs.php +++ b/lib/Alchemy/Phrasea/Command/BuildSubdefs.php @@ -103,7 +103,7 @@ class BuildSubdefs extends Command $sqlCount .= " AND (s.substit = 0)"; } } elseif ($substitutionOnly) { - throw new InvalidArgumentException('Conflict, you can not ask for --substituion-only && --with-substitution parameters at the same time'); + throw new InvalidArgumentException('Conflict, you can not ask for --substitution-only && --with-substitution parameters at the same time'); } list($sqlCount, $stmtParams) = SQLParserUtils::expandListParameters($sqlCount, $params, $types); diff --git a/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php index 6972f12875..6646ac9d99 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/TasksServiceProvider.php @@ -82,7 +82,6 @@ class TasksServiceProvider implements ServiceProviderInterface new SubdefsJob($app['dispatcher'], $logger, $app['translator']), new WriteMetadataJob($app['dispatcher'], $logger, $app['translator']), new WebhookJob($app['dispatcher'], $logger, $app['translator']), - new IndexerJob($app['dispatcher'], $logger, $app['translator']), ]; }); } diff --git a/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php b/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php index f8c89f4795..e2ee1478f8 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php +++ b/lib/Alchemy/Phrasea/TaskManager/Editor/SubdefsEditor.php @@ -39,7 +39,17 @@ class SubdefsEditor extends AbstractEditor return << - 0 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 5 + 20 + 256 EOF; } @@ -50,7 +60,17 @@ EOF; protected function getFormProperties() { return [ - 'embedded' => static::FORM_TYPE_BOOLEAN, + 'sbas' => static::FORM_TYPE_INTEGER, + 'type_image' => static::FORM_TYPE_BOOLEAN, + 'type_video' => static::FORM_TYPE_BOOLEAN, + 'type_audio' => static::FORM_TYPE_BOOLEAN, + 'type_document' => static::FORM_TYPE_BOOLEAN, + 'type_flash' => static::FORM_TYPE_BOOLEAN, + 'type_unknown' => static::FORM_TYPE_BOOLEAN, + 'flush' => static::FORM_TYPE_INTEGER, + 'maxrecs' => static::FORM_TYPE_INTEGER, + 'maxmegs' => static::FORM_TYPE_INTEGER, + 'embedded' => static::FORM_TYPE_BOOLEAN ]; } } diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/IndexerJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/IndexerJob.php deleted file mode 100644 index 050f851754..0000000000 --- a/lib/Alchemy/Phrasea/TaskManager/Job/IndexerJob.php +++ /dev/null @@ -1,58 +0,0 @@ -translator->trans('Indexation task'); - } - - /** - * {@inheritdoc} - */ - public function getJobId() - { - return 'Indexer'; - } - - /** - * {@inheritdoc} - */ - public function getDescription() - { - return $this->translator->trans("Indexing Batch (collections/databox)"); - } - - /** - * {@inheritdoc} - */ - public function getEditor() - { - return new IndexerEditor($this->translator); - } - - /** - * {@inheritdoc} - */ - protected function doJob(JobData $data) - { - $app = $data->getApplication(); - $app['elasticsearch.indexer']->indexScheduledRecords(); - } -} diff --git a/templates/web/admin/task-manager/task-editor/indexer.html.twig b/templates/web/admin/task-manager/task-editor/indexer.html.twig deleted file mode 100644 index 13e24cb9f4..0000000000 --- a/templates/web/admin/task-manager/task-editor/indexer.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends 'admin/task-manager/task-editor/task.html.twig' %} diff --git a/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig b/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig deleted file mode 100644 index 5dfb22f350..0000000000 --- a/templates/web/admin/task-manager/task-editor/phraseanet-indexer.html.twig +++ /dev/null @@ -1,162 +0,0 @@ -{% extends 'admin/task-manager/task-editor/task.html.twig' %} - -{% block form %} -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - {{ 'example : fr,en' | trans }} -
-
-
- -
- -
-
-
-
- -
-
-
-
- -
-
-
-
cmd
-
- -{% endblock %} - - -{% block javascript %} - function taskFillGraphic(xml) - { - if (xml) { - xml = $.parseXML(xml); - xml = $(xml); - - var isyes = function(v) { - v = v.toUpperCase().trim(); - - return v=='O' || v=='Y' || v=='OUI' || v=='YES' || v=='1'; - } - - with(document.forms['graphicForm']) - { - host.value = xml.find("host").text(); - port.value = xml.find("port").text(); - base.value = xml.find("base").text(); - user.value = xml.find("user").text(); - socket.value = xml.find("socket").text(); - password.value = xml.find("password").text(); - clng.value = xml.find("clng").text(); - nolog.checked = isyes(xml.find("nolog").text()); - winsvc_run.checked = isyes(xml.find("winsvc_run").text()); - charset.value = xml.find("charset").text(); - stem.value = xml.find("stem").text(); - sortempty.value = xml.find("sortempty").text(); - debugmask.value = 0|xml.find("debugmask").text(); - } - - - var cmd = ''; - with(document.forms['graphicForm']) - { - cmd += "/path/to/indexer"; - if(host.value) - cmd += " -h=" + host.value; - if(port.value) - cmd += " -P=" + port.value; - if(base.value) - cmd += " -b=" + base.value; - if(user.value) - cmd += " -u=" + user.value; - if(password.value) - cmd += " -p=xxxxxx"; // + password.value; - if(socket.value) - cmd += " --socket=" + socket.value; - if(charset.value) - cmd += " --default-character-set=" + charset.value; - - cmd += " -o"; - - if(nolog.checked) - cmd += " -n"; - if(clng.value) - cmd += " -c=" + clng.value; - if(stem.value) - cmd += " --stem=" + stem.value; - if(sortempty.value) - cmd += " --sort-empty=" + sortempty.value; - if(debugmask.value) - cmd += " -d=" + debugmask.value; - if(winsvc_run.checked) - cmd += " --run"; - } - $('#cmd').html(cmd); - } - } - $(document).ready(function(){ - $("#graphicForm *").change(function(){ - taskFillGraphic(null); - }); - }); -{% endblock %} diff --git a/templates/web/admin/task-manager/task-editor/subdefs.html.twig b/templates/web/admin/task-manager/task-editor/subdefs.html.twig index 71f9616cf7..cae411c3e1 100644 --- a/templates/web/admin/task-manager/task-editor/subdefs.html.twig +++ b/templates/web/admin/task-manager/task-editor/subdefs.html.twig @@ -1,6 +1,62 @@ {% extends 'admin/task-manager/task-editor/task.html.twig' %} {% block form %} +
+ +
+ +
+
+
+ +
+ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + Mo +
+