diff --git a/sapl/templates/base/RelatorioPresencaSessao_filter.html b/sapl/templates/base/RelatorioPresencaSessao_filter.html
index e3e447f8d..9836235ca 100644
--- a/sapl/templates/base/RelatorioPresencaSessao_filter.html
+++ b/sapl/templates/base/RelatorioPresencaSessao_filter.html
@@ -25,6 +25,7 @@
{% if paginator.count %}
{% if paginator.count > 1 %}
-
{% endif %}
@@ -61,92 +67,96 @@
{% endif %}
{% if m.autoria_set.all %}
-
+ {% for a in m.autoria_set.all %}
{% if not forloop.first %}
{{a.autor}}
{% else %}
{{a.autor}}
{% endif %}
- {% endfor %}
-
- {% endif %}
- {% if m.tramitacao_set.last.unidade_tramitacao_destino %}
-
{{m.tramitacao_set.last.unidade_tramitacao_destino}}
- {% endif %}
- {% if m.tramitacao_set.last.status %}
-
{{m.tramitacao_set.last.data_fim_prazo|default_if_none:""}}
- {% endif %}
- {% if m.registrovotacao_set.exists %}
-
- {% for rv in m.registrovotacao_set.all %}
- {% if rv.ordem %}
-
- {% endif %}
-
- {% endfor %}
- {% endif %}
- {% if m.tramitacao_set.last.data_tramitacao %}
-
{{m.tramitacao_set.last.texto}}
- {% endif %}
- {% if m.anexo_de.exists %}
- {% for a in m.materia_anexada_set.all %}
-
{{a.data_anexacao}}
-
{% endfor %}
- {% endif %}
- {% if m.anexadas.all.exists %}
- {% for anexada in m.materia_principal_set.all %}
-
{{anexada.data_anexacao}}
- {% endfor %}
{% endif %}
- {% if m.documentoacessorio_set.all.exists %}
-
+ {% elif rv.expediente %}
+
+ {% endif %}
+
+ {% endfor %}
+ {% endif %}
+ {% if m.tramitacao_set.last.data_tramitacao %}
+
{{m.tramitacao_set.last.texto}}
+ {% endif %}
+ {% if m.anexo_de.exists %}
+ {% for a in m.materia_anexada_set.all %}
+
{{a.data_anexacao}}
- {% endif %}
- {% if m.texto_original %}
{% endif %}
- {% if m.normajuridica_set.exists %}
- {% for nr in m.normajuridica_set.all %}
-
{{anexada.data_anexacao}}
+
+ {% endfor %}
+ {% endif %}
+ {% if m.documentoacessorio_set.all.exists %}
+
+ {% endif %}
+ {% if m.texto_original %}
{% endif %}
+ {% if m.normajuridica_set.exists %}
+ {% for nr in m.normajuridica_set.all %}
+
+
+ {% endfor %}
+ {% endif %}
+ {% if m.audienciapublica_set.exists %}
+
+ {% for ap in m.audienciapublica_set.all %}
+
+ {% if not forloop.last %}, {% endif %}
{% endfor %}
- {% endif %}
- {% if m.audienciapublica_set.exists %}
-
- {% for ap in m.audienciapublica_set.all %}
-
- {% if not forloop.last %}, {% endif %}
- {% endfor %}
- {% endif %}
-
- {% if m.em_tramitacao and mail_service_configured %}
-
+ {% if m.em_tramitacao and mail_service_configured %}
+
+ {% endif %}
{% endif %}
diff --git a/sapl/templates/norma/normajuridica_filter.html b/sapl/templates/norma/normajuridica_filter.html
index ef668cf36..0c7547661 100644
--- a/sapl/templates/norma/normajuridica_filter.html
+++ b/sapl/templates/norma/normajuridica_filter.html
@@ -4,11 +4,11 @@
{% block actions %}
-
+ {% if USE_SOLR %}
+
+ Pesquisa Textual
+
+ {% endif %}
{% if perms.norma.add_normajuridica %}
diff --git a/sapl/utils.py b/sapl/utils.py
index 77e1cec2d..def839eb1 100644
--- a/sapl/utils.py
+++ b/sapl/utils.py
@@ -16,6 +16,7 @@ from django.contrib.contenttypes.fields import (GenericForeignKey, GenericRel,
GenericRelation)
from django.core.exceptions import ValidationError
from django.core.mail import get_connection
+from django.db import models
from django.db.models import Q
from django.utils import six, timezone
from django.utils.translation import ugettext_lazy as _
@@ -319,9 +320,10 @@ LISTA_DE_UFS = [
('EX', 'Exterior'),
]
-RANGE_ANOS = [(year, year) for year in range(timezone.now().year,
+RANGE_ANOS = [(year, year) for year in range(timezone.now().year + 1,
1889, -1)]
+
RANGE_MESES = [
(1, 'Janeiro'),
(2, 'Fevereiro'),
@@ -339,6 +341,88 @@ RANGE_MESES = [
RANGE_DIAS_MES = [(n, n) for n in range(1, 32)]
+
+def ANO_CHOICES():
+ return [('', '---------')] + RANGE_ANOS
+
+
+def choice_anos(model):
+ try:
+ anos_list = model.objects.all().distinct(
+ 'ano').order_by('-ano').values_list('ano', 'ano')
+ return list(anos_list)
+ except Exception:
+ return []
+
+
+def choice_anos_com_materias():
+ from sapl.materia.models import MateriaLegislativa
+ return choice_anos(MateriaLegislativa)
+
+
+def choice_anos_com_normas():
+ from sapl.norma.models import NormaJuridica
+ return choice_anos(NormaJuridica)
+
+
+def choice_anos_com_protocolo():
+ from sapl.protocoloadm.models import Protocolo
+ return choice_anos(Protocolo)
+
+
+def choice_anos_com_documentoadministrativo():
+ from sapl.protocoloadm.models import DocumentoAdministrativo
+ return choice_anos(DocumentoAdministrativo)
+
+
+def choice_anos_com_sessaoplenaria():
+ try:
+ from sapl.sessao.models import SessaoPlenaria
+ anos_list = SessaoPlenaria.objects.all().dates('data_inicio', 'year')
+ # a listagem deve ser em ordem descrescente, mas por algum motivo
+ # a adicao de .order_by acima depois do all() nao surte efeito
+ # apos a adicao do .dates(), por isso o reversed() abaixo
+ anos = [(k.year, k.year) for k in reversed(anos_list)]
+ return anos
+ except Exception:
+ return []
+
+
+def choice_force_optional(callable):
+ """ Django-filter faz algo que tenha o mesmo sentido em ChoiceFilter,
+ no entanto, as funções choice_anos_... podem ser usadas em formulários
+ comuns de adição e/ou edição, com a particularidade de terem
+ required=False.
+ Neste caso para ser possível contar com a otimização de apenas mostrar anos
+ que estejam na base de dados e ainda colocar o item opcional '---------',
+ é necessário encapsular então, as funções choice_anos_... com a
+ esta função choice_force_optional... isso ocorre e foi aplicado
+ inicialmente no cadastro de documentos administrativos onde tem-se
+ opcionalmente a possibilidade de colocar o ano do protocolo.
+ Em ChoiceFilter choice_force_optional não deve ser usado pois duplicaria
+ o item opcional '---------' já que ChoiceFilter já o adiciona, como dito
+ anteriormente.
+ """
+ def _func():
+ return [('', '---------')] + callable()
+ return _func
+
+
+FILTER_OVERRIDES_DATEFIELD = {
+ 'filter_class': django_filters.DateFromToRangeFilter,
+ 'extra': lambda f: {
+ 'label': '%s (%s)' % (f.verbose_name, _('Inicial - Final')),
+ 'widget': RangeWidgetOverride
+ }
+}
+
+
+class FilterOverridesMetaMixin:
+ filter_overrides = {
+ models.DateField: FILTER_OVERRIDES_DATEFIELD
+ }
+
+
TIPOS_TEXTO_PERMITIDOS = (
'application/vnd.oasis.opendocument.text',
'application/x-vnd.oasis.opendocument.text',
diff --git a/setup.py b/setup.py
index fd2490fbf..6b7c5a248 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,6 @@ install_requires = [
'dj-database-url==0.4.1',
'django-haystack==2.6.0',
'django>=1.10,<1.11',
- # TODO O django-admin-bootstrapped 2.5.7 não inseriu a mudança que permite
- # a compatibilidade com Django 1.9+. A linha abaixo será mudada quando uma
- # nova versão do django-admin-bootstrapped for lançada
- # 'git+git://github.com/django-admin-bootstrapped/
- # django-admin-bootstrapped.git',
'django-bootstrap3==7.0.1',
'django-bower==5.2.0',
'django-braces==1.9.0',
@@ -32,12 +27,11 @@ install_requires = [
'drfdocs',
'easy-thumbnails==2.5',
'django-image-cropping==1.1.0',
- # 'git+git://github.com/interlegis/trml2pdf.git',
'libsass==0.11.1',
'psycopg2==2.7.4',
'python-decouple==3.0',
'pytz==2016.4',
- 'pyyaml==3.11',
+ 'pyyaml==4.2b1',
'rtyaml==0.0.3',
'textract==1.5.0',
'unipath==1.1',
@@ -49,10 +43,13 @@ install_requires = [
'whoosh==2.7.4',
'django-speedinfo==1.3.5',
'django-reversion-compare==0.8.4'
+ # 'git+git://github.com/interlegis/trml2pdf.git',
+ # 'git+git://github.com/jasperlittle/django-rest-framework-docs'
+ # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git''
]
setup(
name='interlegis-sapl',
- version='3.1.138',
+ version='3.1.140',
packages=find_packages(),
include_package_data=True,
license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007',
diff --git a/solr/docker-compose.yml b/solr/docker-compose.yml
new file mode 100644
index 000000000..8d331443e
--- /dev/null
+++ b/solr/docker-compose.yml
@@ -0,0 +1,61 @@
+version: '2'
+services:
+ sapldb:
+ image: postgres:10.5-alpine
+ restart: always
+ environment:
+ POSTGRES_PASSWORD: sapl
+ POSTGRES_USER: sapl
+ POSTGRES_DB: sapl
+ PGDATA : /var/lib/postgresql/data/
+ volumes:
+ - sapldb_data:/var/lib/postgresql/data/
+ ports:
+ - "5432:5432"
+
+ saplsolr:
+ image: solr:7.4-alpine
+ restart: always
+ command: bin/solr start -c -f
+ volumes:
+ - solr_data:/opt/solr/server/solr
+ - solr_configsets:/opt/solr/server/solr/configsets
+ ports:
+ - "8983:8983"
+
+ sapl:
+ image: interlegis/sapl:3.1.138
+ # build: .
+ restart: always
+ environment:
+ ADMIN_PASSWORD: interlegis
+ ADMIN_EMAIL: email@dominio.net
+ DEBUG: 'False'
+ EMAIL_PORT: 587
+ EMAIL_USE_TLS: 'False'
+ EMAIL_HOST: smtp.dominio.net
+ EMAIL_HOST_USER: usuariosmtp
+ EMAIL_HOST_PASSWORD: senhasmtp
+ USE_SOLR: 'True'
+ #SOLR_COLLECTION: sapl
+ #SOLR_HOST: saplsolr
+ SOLR_URL: http://saplsolr:8983/solr/sapl
+ TZ: America/Sao_Paulo
+ volumes:
+ - sapl_data:/var/interlegis/sapl/data
+ - sapl_media:/var/interlegis/sapl/media
+ - sapl_root:/var/interlegis/sapl
+ volumes_from:
+ - saplsolr
+ depends_on:
+ - sapldb
+ - saplsolr
+ ports:
+ - "80:80"
+volumes:
+ sapldb_data:
+ sapl_data:
+ sapl_media:
+ sapl_root:
+ solr_data:
+ solr_configsets:
diff --git a/solr/sapl_configset/conf/lang/stopwords_en.txt b/solr/sapl_configset/conf/lang/stopwords_en.txt
new file mode 100644
index 000000000..2c164c0b2
--- /dev/null
+++ b/solr/sapl_configset/conf/lang/stopwords_en.txt
@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
diff --git a/solr/sapl_configset/conf/lang/stopwords_pt.txt b/solr/sapl_configset/conf/lang/stopwords_pt.txt
new file mode 100644
index 000000000..acfeb01af
--- /dev/null
+++ b/solr/sapl_configset/conf/lang/stopwords_pt.txt
@@ -0,0 +1,253 @@
+ | From svn.tartarus.org/snowball/trunk/website/algorithms/portuguese/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ | - Encoding was converted to UTF-8.
+ | - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | A Portuguese stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+
+ | The following is a ranked list (commonest to rarest) of stopwords
+ | deriving from a large sample of text.
+
+ | Extra words have been added at the end.
+
+de | of, from
+a | the; to, at; her
+o | the; him
+que | who, that
+e | and
+do | de + o
+da | de + a
+em | in
+um | a
+para | for
+ | é from SER
+com | with
+não | not, no
+uma | a
+os | the; them
+no | em + o
+se | himself etc
+na | em + a
+por | for
+mais | more
+as | the; them
+dos | de + os
+como | as, like
+mas | but
+ | foi from SER
+ao | a + o
+ele | he
+das | de + as
+ | tem from TER
+à | a + a
+seu | his
+sua | her
+ou | or
+ | ser from SER
+quando | when
+muito | much
+ | há from HAV
+nos | em + os; us
+já | already, now
+ | está from EST
+eu | I
+também | also
+só | only, just
+pelo | per + o
+pela | per + a
+até | up to
+isso | that
+ela | he
+entre | between
+ | era from SER
+depois | after
+sem | without
+mesmo | same
+aos | a + os
+ | ter from TER
+seus | his
+quem | whom
+nas | em + as
+me | me
+esse | that
+eles | they
+ | estão from EST
+você | you
+ | tinha from TER
+ | foram from SER
+essa | that
+num | em + um
+nem | nor
+suas | her
+meu | my
+às | a + as
+minha | my
+ | têm from TER
+numa | em + uma
+pelos | per + os
+elas | they
+ | havia from HAV
+ | seja from SER
+qual | which
+ | será from SER
+nós | we
+ | tenho from TER
+lhe | to him, her
+deles | of them
+essas | those
+esses | those
+pelas | per + as
+este | this
+ | fosse from SER
+dele | of him
+
+ | other words. There are many contractions such as naquele = em+aquele,
+ | mo = me+o, but they are rare.
+ | Indefinite article plural forms are also rare.
+
+tu | thou
+te | thee
+vocês | you (plural)
+vos | you
+lhes | to them
+meus | my
+minhas
+teu | thy
+tua
+teus
+tuas
+nosso | our
+nossa
+nossos
+nossas
+
+dela | of her
+delas | of them
+
+esta | this
+estes | these
+estas | these
+aquele | that
+aquela | that
+aqueles | those
+aquelas | those
+isto | this
+aquilo | that
+
+ | forms of estar, to be (not including the infinitive):
+estou
+está
+estamos
+estão
+estive
+esteve
+estivemos
+estiveram
+estava
+estávamos
+estavam
+estivera
+estivéramos
+esteja
+estejamos
+estejam
+estivesse
+estivéssemos
+estivessem
+estiver
+estivermos
+estiverem
+
+ | forms of haver, to have (not including the infinitive):
+hei
+há
+havemos
+hão
+houve
+houvemos
+houveram
+houvera
+houvéramos
+haja
+hajamos
+hajam
+houvesse
+houvéssemos
+houvessem
+houver
+houvermos
+houverem
+houverei
+houverá
+houveremos
+houverão
+houveria
+houveríamos
+houveriam
+
+ | forms of ser, to be (not including the infinitive):
+sou
+somos
+são
+era
+éramos
+eram
+fui
+foi
+fomos
+foram
+fora
+fôramos
+seja
+sejamos
+sejam
+fosse
+fôssemos
+fossem
+for
+formos
+forem
+serei
+será
+seremos
+serão
+seria
+seríamos
+seriam
+
+ | forms of ter, to have (not including the infinitive):
+tenho
+tem
+temos
+tém
+tinha
+tínhamos
+tinham
+tive
+teve
+tivemos
+tiveram
+tivera
+tivéramos
+tenha
+tenhamos
+tenham
+tivesse
+tivéssemos
+tivessem
+tiver
+tivermos
+tiverem
+terei
+terá
+teremos
+terão
+teria
+teríamos
+teriam
diff --git a/solr/sapl_configset/conf/managed-schema b/solr/sapl_configset/conf/managed-schema
new file mode 100644
index 000000000..0cba1950a
--- /dev/null
+++ b/solr/sapl_configset/conf/managed-schema
@@ -0,0 +1,573 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/sapl_configset/conf/params.json b/solr/sapl_configset/conf/params.json
new file mode 100644
index 000000000..06114ef25
--- /dev/null
+++ b/solr/sapl_configset/conf/params.json
@@ -0,0 +1,20 @@
+{"params":{
+ "query":{
+ "defType":"edismax",
+ "q.alt":"*:*",
+ "rows":"10",
+ "fl":"*,score",
+ "":{"v":0}
+ },
+ "facets":{
+ "facet":"on",
+ "facet.mincount": "1",
+ "":{"v":0}
+ },
+ "velocity":{
+ "wt": "velocity",
+ "v.template":"browse",
+ "v.layout": "layout",
+ "":{"v":0}
+ }
+}}
\ No newline at end of file
diff --git a/solr/sapl_configset/conf/protwords.txt b/solr/sapl_configset/conf/protwords.txt
new file mode 100644
index 000000000..1dfc0abec
--- /dev/null
+++ b/solr/sapl_configset/conf/protwords.txt
@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+
diff --git a/solr/sapl_configset/conf/saplconfigset.zip b/solr/sapl_configset/conf/saplconfigset.zip
new file mode 100644
index 000000000..13a7a41ce
Binary files /dev/null and b/solr/sapl_configset/conf/saplconfigset.zip differ
diff --git a/solr/sapl_configset/conf/schema.xml b/solr/sapl_configset/conf/schema.xml
new file mode 100644
index 000000000..597033929
--- /dev/null
+++ b/solr/sapl_configset/conf/schema.xml
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id
+
+
+ text
+
+
+
+
diff --git a/solr/sapl_configset/conf/solrconfig.xml b/solr/sapl_configset/conf/solrconfig.xml
new file mode 100644
index 000000000..9a9f29196
--- /dev/null
+++ b/solr/sapl_configset/conf/solrconfig.xml
@@ -0,0 +1,1367 @@
+
+
+
+
+
+
+
+
+ 7.3.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.data.dir:}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.lock.type:native}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.ulog.dir:}
+ ${solr.ulog.numVersionBuckets:65536}
+
+
+
+
+ 300000
+ false
+
+
+
+
+
+ 30000
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1024
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 20
+
+
+ 200
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ explicit
+ 10
+ text
+ edismax
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ explicit
+ json
+ true
+
+
+
+
+
+
+
+ explicit
+
+
+
+
+
+ _text_
+
+
+
+
+
+
+ true
+ ignored_
+ _text_
+
+
+
+
+
+
+
+
+ text_general
+
+
+
+
+
+ default
+ _text_
+ solr.DirectSolrSpellChecker
+
+ internal
+
+ 0.5
+
+ 2
+
+ 1
+
+ 5
+
+ 4
+
+ 0.01
+
+
+
+
+
+
+
+
+
+
+
+ default
+ on
+ true
+ 10
+ 5
+ 5
+ true
+ true
+ 10
+ 5
+
+
+ spellcheck
+
+
+
+
+
+
+
+
+
+ true
+
+
+ tvComponent
+
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+
+
+ terms
+
+
+
+
+
+
+
+ string
+
+
+
+
+
+ explicit
+
+
+ elevator
+
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+ 70
+
+ 0.5
+
+ [-\w ,/\n\"']{20,200}
+
+
+
+
+
+
+ ]]>
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ,,
+ ,,
+ ,,
+ ,,
+ ,]]>
+ ]]>
+
+
+
+
+
+ 10
+ .,!?
+
+
+
+
+
+
+ WORD
+
+
+ en
+ US
+
+
+
+
+
+
+
+
+
+
+
+ [^\w-\.]
+ _
+
+
+
+
+
+
+ yyyy-MM-dd'T'HH:mm:ss.SSSZ
+ yyyy-MM-dd'T'HH:mm:ss,SSSZ
+ yyyy-MM-dd'T'HH:mm:ss.SSS
+ yyyy-MM-dd'T'HH:mm:ss,SSS
+ yyyy-MM-dd'T'HH:mm:ssZ
+ yyyy-MM-dd'T'HH:mm:ss
+ yyyy-MM-dd'T'HH:mmZ
+ yyyy-MM-dd'T'HH:mm
+ yyyy-MM-dd HH:mm:ss.SSSZ
+ yyyy-MM-dd HH:mm:ss,SSSZ
+ yyyy-MM-dd HH:mm:ss.SSS
+ yyyy-MM-dd HH:mm:ss,SSS
+ yyyy-MM-dd HH:mm:ssZ
+ yyyy-MM-dd HH:mm:ss
+ yyyy-MM-dd HH:mmZ
+ yyyy-MM-dd HH:mm
+ yyyy-MM-dd
+
+
+
+
+ java.lang.String
+ text_general
+
+ *_str
+ 256
+
+
+ true
+
+
+ java.lang.Boolean
+ booleans
+
+
+ java.util.Date
+ pdates
+
+
+ java.lang.Long
+ java.lang.Integer
+ plongs
+
+
+ java.lang.Number
+ pdoubles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain; charset=UTF-8
+
+
+
+
+ ${velocity.template.base.dir:}
+ ${velocity.solr.resource.loader.enabled:true}
+ ${velocity.params.resource.loader.enabled:false}
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/sapl_configset/conf/stopwords.txt b/solr/sapl_configset/conf/stopwords.txt
new file mode 100644
index 000000000..ae1e83eeb
--- /dev/null
+++ b/solr/sapl_configset/conf/stopwords.txt
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/solr/sapl_configset/conf/synonyms.txt b/solr/sapl_configset/conf/synonyms.txt
new file mode 100644
index 000000000..eab4ee875
--- /dev/null
+++ b/solr/sapl_configset/conf/synonyms.txt
@@ -0,0 +1,29 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaafoo => aaabar
+bbbfoo => bbbfoo bbbbar
+cccfoo => cccbar cccbaz
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterGraphFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
+
diff --git a/solr_api.py b/solr_api.py
new file mode 100755
index 000000000..9bec45daa
--- /dev/null
+++ b/solr_api.py
@@ -0,0 +1,155 @@
+
+import requests
+import subprocess
+import sys
+import argparse
+
+
+class SolrClient:
+
+ LIST_CONFIGSETS = "{}/solr/admin/configs?action=LIST&omitHeader=true&wt=json"
+ UPLOAD_CONFIGSET = "{}/solr/admin/configs?action=UPLOAD&name={}&wt=json"
+ LIST_COLLECTIONS = "{}/solr/admin/collections?action=LIST&wt=json"
+ STATUS_COLLECTION = "{}/solr/admin/collections?action=CLUSTERSTATUS&collection={}&wt=json"
+ STATUS_CORE = "{}/admin/cores?action=STATUS&name={}"
+ EXISTS_COLLECTION = "{}/solr/{}/admin/ping?wt=json"
+ OPTIMIZE_COLLECTION = "{}/solr/{}/update?optimize=true&wt=json"
+ CREATE_COLLECTION = "{}/solr/admin/collections?action=CREATE&name={}&collection.configName={}&numShards={}&replicationFactor={}&maxShardsPerNode={}&wt=json"
+ DELETE_COLLECTION = "{}/solr/admin/collections?action=DELETE&name={}&wt=json"
+ DELETE_DATA = "{}/solr/{}/update?commitWithin=1000&overwrite=true&wt=json"
+ QUERY_DATA = "{}/solr/{}/select?q=*:*"
+
+ CONFIGSET_NAME = "sapl_configset"
+
+ def __init__(self, url):
+ self.url = url
+
+ def get_num_docs(self, collection_name):
+ final_url = self.QUERY_DATA.format(self.url, collection_name)
+ res = requests.get(final_url)
+ dic = res.json()
+ num_docs = dic["response"]["numFound"]
+ return num_docs
+
+ def list_collections(self):
+ req_url = self.LIST_COLLECTIONS.format(self.url)
+ res = requests.get(req_url)
+ dic = res.json()
+ return dic['collections']
+
+ def exists_collection(self, collection_name):
+ collections = self.list_collections()
+ return True if collection_name in collections else False
+
+ def maybe_upload_configset(self, force=False):
+ req_url = self.LIST_CONFIGSETS.format(self.url)
+ res = requests.get(req_url)
+ dic = res.json()
+ configsets = dic['configSets']
+ # UPLOAD configset
+ if not self.CONFIGSET_NAME in configsets or force:
+ files = {'file': ('saplconfigset.zip',
+ open('./solr/sapl_configset/conf/saplconfigset.zip',
+ 'rb'),
+ 'application/octet-stream',
+ {'Expires': '0'})}
+
+ req_url = self.UPLOAD_CONFIGSET.format(self.url, self.CONFIGSET_NAME)
+
+ resp = requests.post(req_url, files=files)
+ print(resp.content)
+ else:
+ print('O %s já presente no servidor, NÃO enviando.' % self.CONFIGSET_NAME)
+
+ def create_collection(self, collection_name, shards=1, replication_factor=1, max_shards_per_node=1):
+ self.maybe_upload_configset()
+ req_url = self.CREATE_COLLECTION.format(self.url,
+ collection_name,
+ self.CONFIGSET_NAME,
+ shards,
+ replication_factor,
+ max_shards_per_node)
+ res = requests.post(req_url)
+ if res.ok:
+ print("Collection '%s' created succesfully" % collection_name)
+ else:
+ print("Error creating collection '%s'" % collection_name)
+ as_json = res.json()
+ print("Error %s: %s" % (res.status_code, as_json['error']['msg']))
+ return False
+ return True
+
+ def delete_collection(self, collection_name):
+ if collection_name == '*':
+ collections = self.list_collections()
+ else:
+ collections = [collection_name]
+
+ for c in collections:
+ req_url = self.DELETE_COLLECTION.format(self.url, c)
+ res = requests.post(req_url)
+ if not res.ok:
+ print("Error deleting collection '%s'", c)
+ print("Code {}: {}".format(res.status_code, res.text))
+ else:
+ print("Collection '%s' deleted successfully!" % c)
+
+ def delete_index_data(self, collection_name):
+ req_url = self.DELETE_DATA.format(self.url, collection_name)
+ res = requests.post(req_url,
+ data='
*:*',
+ headers={'Content-Type': 'application/xml'})
+ if not res.ok:
+ print("Error deleting index for collection '%s'", collection_name)
+ print("Code {}: {}".format(res.status_code, res.text))
+ else:
+ print("Collection '%s' data deleted successfully!" % collection_name)
+
+ num_docs = self.get_num_docs(collection_name)
+ print("Num docs: %s" % num_docs)
+
+
+if __name__ == '__main__':
+
+ parser = argparse.ArgumentParser(description='Cria uma collection no Solr')
+
+ # required arguments
+ parser.add_argument('-u', type=str, metavar='URL', nargs=1, dest='url',
+ required=True, help='Endereço do servidor Solr na forma http(s)://
[:port]')
+ parser.add_argument('-c', type=str, metavar='COLLECTION', dest='collection', nargs=1,
+ required=True, help='Collection Solr a ser criada')
+
+ # optional arguments
+ parser.add_argument('-s', type=int, dest='shards', nargs='?',
+ help='Number of shards (default=1)', default=1)
+ parser.add_argument('-rf', type=int, dest='replication_factor', nargs='?',
+ help='Replication factor (default=1)', default=1)
+ parser.add_argument('-ms', type=int, dest='max_shards_per_node', nargs='?',
+ help='Max shards per node (default=1)', default=1)
+
+ try:
+ args = parser.parse_args()
+ except IOError as msg:
+ parser.error(str(msg))
+ sys.exit(-1)
+
+ url = args.url.pop()
+ collection = args.collection.pop()
+
+ client = SolrClient(url=url)
+
+ if not client.exists_collection(collection):
+ print("Collection '%s' doesn't exists. Creating a new one..." % collection)
+ created = client.create_collection(collection,
+ shards=args.shards,
+ replication_factor=args.replication_factor,
+ max_shards_per_node=args.max_shards_per_node)
+ if not created:
+ sys.exit(-1)
+ else:
+ print("Collection '%s' exists." % collection)
+
+ num_docs = client.get_num_docs(collection)
+ if num_docs == 0:
+ print("Performing a full reindex of '%s' collection..." % collection)
+ p = subprocess.call(["python3", "manage.py", "rebuild_index", "--noinput"])
diff --git a/start.sh b/start.sh
index 9695572ef..fb9a7bddd 100755
--- a/start.sh
+++ b/start.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
create_env() {
echo "[ENV FILE] creating .env file..."
@@ -36,6 +36,10 @@ create_env() {
echo "EMAIL_SEND_USER = ""${EMAIL_HOST_USER-''}" >> $FILENAME
echo "DEFAULT_FROM_EMAIL = ""${EMAIL_HOST_USER-''}" >> $FILENAME
echo "SERVER_EMAIL = ""${EMAIL_HOST_USER-''}" >> $FILENAME
+ echo "USE_SOLR = ""${USE_SOLR-False}" >> $FILENAME
+ echo "SOLR_COLLECTION = ""${SOLR_COLLECTION-sapl}" >> $FILENAME
+ echo "SOLR_URL = ""${SOLR_URL-http://localhost:8983}" >> $FILENAME
+
echo "[ENV FILE] done."
}
@@ -44,12 +48,41 @@ create_env
#python3 manage.py bower install
-/bin/sh busy-wait.sh $DATABASE_URL
+/bin/bash busy-wait.sh $DATABASE_URL
+
# manage.py migrate --noinput nao funcionava
yes yes | python3 manage.py migrate
-#python3 manage.py collectstatic --no-input
-# python3 manage.py rebuild_index --noinput &
+# python3 manage.py collectstatic --no-input
+
+
+## SOLR
+USE_SOLR="${USE_SOLR:=False}"
+SOLR_URL="${SOLR_URL:=http://localhost:8983}"
+SOLR_COLLECTION="${SOLR_COLLECTION:=sapl}"
+
+NUM_SHARDS=${NUM_SHARDS:=1}
+RF=${RF:=1}
+MAX_SHARDS_PER_NODE=${MAX_SHARDS_PER_NODE:=1}
+
+if [ "${USE_SOLR-False}" == "True" ]; then
+
+ echo "SOLR configurations"
+ echo "==================="
+ echo "URL: $SOLR_URL"
+ echo "COLLECTION: $SOLR_COLLECTION"
+ echo "NUM_SHARDS: $NUM_SHARDS"
+ echo "REPLICATION FACTOR: $RF"
+ echo "MAX SHARDS PER NODE: $MAX_SHARDS_PER_NODE"
+ echo "========================================="
+
+ /bin/bash check_solr.sh $SOLR_URL
+
+ python3 solr_api.py -u $SOLR_URL -c $SOLR_COLLECTION -s $NUM_SHARDS -rf $RF -ms $MAX_SHARDS_PER_NODE &
+ # python3 manage.py rebuild_index --noinput &
+else
+ echo "Suporte a SOLR não inicializado."
+fi
echo "Criando usuário admin..."