Skip to content

Commit

Permalink
Merge branch 'test' into 'master'
Browse files Browse the repository at this point in the history 
Test

See merge request nk/periodik!12
  • Loading branch information
@Kretiss
Kretiss committed May 9, 2023
2 parents e8e2de7 + 211b0f6 commit 0c098ac
Show file tree
Hide file tree
Showing 189 changed files with 23,667 additions and 13,370 deletions.
52 changes: 7 additions & 45 deletions inprove.evidence.periodik.iml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<excludeFolder url="file://$MODULE_DIR$/src/main/ng14-client/dist" />
<excludeFolder url="file://$MODULE_DIR$/src/main/ng14-client/tmp" />
</content>
</component>
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/context.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
Expand All @@ -22,37 +17,4 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/src/main/ng14-client/tmp" />
<excludeFolder url="file://$MODULE_DIR$/src/main/ng14-client/dist" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:7.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.10" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
<orderEntry type="library" name="Maven: org.noggit:noggit:0.8" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.4" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP-java7:2.4.13" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax:javaee-web-api:7.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.62" level="project" />
</component>
</module>
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>7.1.0</version>
<version>8.11.2</version>
<type>jar</type>
</dependency>
<dependency>
Expand All @@ -38,13 +38,13 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
<version>20230227</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
<version>1.15</version>
<type>jar</type>
</dependency>
<dependency>
Expand All @@ -55,9 +55,9 @@
</dependency>

<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.27</version>
</dependency>
</dependencies>

Expand Down
0 solr/owners/conf/lang/contractions_ca.txt → solr/calendar/conf/lang/contractions_ca.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/contractions_fr.txt → solr/calendar/conf/lang/contractions_fr.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/contractions_ga.txt → solr/calendar/conf/lang/contractions_ga.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/contractions_it.txt → solr/calendar/conf/lang/contractions_it.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/hyphenations_ga.txt → solr/calendar/conf/lang/hyphenations_ga.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stemdict_nl.txt → solr/calendar/conf/lang/stemdict_nl.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stoptags_ja.txt → solr/calendar/conf/lang/stoptags_ja.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ar.txt → solr/calendar/conf/lang/stopwords_ar.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_bg.txt → solr/calendar/conf/lang/stopwords_bg.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ca.txt → solr/calendar/conf/lang/stopwords_ca.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_da.txt → solr/calendar/conf/lang/stopwords_da.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_de.txt → solr/calendar/conf/lang/stopwords_de.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_el.txt → solr/calendar/conf/lang/stopwords_el.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_es.txt → solr/calendar/conf/lang/stopwords_es.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_eu.txt → solr/calendar/conf/lang/stopwords_eu.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_fa.txt → solr/calendar/conf/lang/stopwords_fa.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_fi.txt → solr/calendar/conf/lang/stopwords_fi.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_fr.txt → solr/calendar/conf/lang/stopwords_fr.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ga.txt → solr/calendar/conf/lang/stopwords_ga.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_gl.txt → solr/calendar/conf/lang/stopwords_gl.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_hi.txt → solr/calendar/conf/lang/stopwords_hi.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_hu.txt → solr/calendar/conf/lang/stopwords_hu.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_hy.txt → solr/calendar/conf/lang/stopwords_hy.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_id.txt → solr/calendar/conf/lang/stopwords_id.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_it.txt → solr/calendar/conf/lang/stopwords_it.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ja.txt → solr/calendar/conf/lang/stopwords_ja.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_lv.txt → solr/calendar/conf/lang/stopwords_lv.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_nl.txt → solr/calendar/conf/lang/stopwords_nl.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_no.txt → solr/calendar/conf/lang/stopwords_no.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_pt.txt → solr/calendar/conf/lang/stopwords_pt.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ro.txt → solr/calendar/conf/lang/stopwords_ro.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_ru.txt → solr/calendar/conf/lang/stopwords_ru.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_sv.txt → solr/calendar/conf/lang/stopwords_sv.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_th.txt → solr/calendar/conf/lang/stopwords_th.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/stopwords_tr.txt → solr/calendar/conf/lang/stopwords_tr.txt
View file
File renamed without changes.
0 solr/owners/conf/lang/userdict_ja.txt → solr/calendar/conf/lang/userdict_ja.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion solr/calendar/conf/solrconfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>7.0.0</luceneMatchVersion>
<luceneMatchVersion>8.11.2</luceneMatchVersion>

<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Expand Down
3 changes: 0 additions & 3 deletions solr/exemplar/conf/configoverlay.json
View file

This file was deleted.

49 changes: 20 additions & 29 deletions solr/exemplar/conf/managed-schema
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</analyzer>
</fieldType>
<fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType" geo="true" maxDistErr="0.001" distErrPct="0.025" distanceUnits="kilometers"/>
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType" geo="true" omitNorms="true" omitTermFreqAndPositions="true" maxDistErr="0.001" termOffsets="false" distErrPct="0.025" distanceUnits="kilometers" termPositions="false" omitPositions="true"/>
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.KeywordTokenizerFactory"/>
Expand All @@ -49,7 +49,6 @@
</fieldType>
<fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
<fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
<fieldType name="rdate" class="solr.DateRangeField"/>
<fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
<fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
<fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
Expand All @@ -65,6 +64,7 @@
<fieldType name="plong" class="solr.LongPointField" docValues="true"/>
<fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
<fieldType name="point" class="solr.PointType" subFieldSuffix="_d" dimension="2"/>
<fieldType name="rdate" class="solr.DateRangeField" omitNorms="true" omitTermFreqAndPositions="true" termOffsets="false" termPositions="false" omitPositions="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true"/>
<fieldType name="strings" class="solr.StrField" sortMissingLast="true" docValues="true" multiValued="true"/>
<fieldType name="text_ar" class="solr.TextField" positionIncrementGap="100">
Expand Down Expand Up @@ -433,50 +433,41 @@
<field name="_version_" type="plong" indexed="false" stored="false"/>
<field name="carovy_kod" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="carovy_kod_vlastnik" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="numExists" type="boolean" multiValued="false" indexed="true" stored="true"/>
<field name="id" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
<field name="id_issue" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
<field name="indextime" type="pdate" default="NOW" multiValued="false" indexed="true" stored="true"/>
<field name="oznaceni" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="pages" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="pagesRange" type="string" multiValued="true" indexed="true" stored="true"/>
<field name="popis_oznaceni_vydani" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="poznamka" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="signatura" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="stav" type="string" multiValued="true" indexed="true" stored="true"/>
<field name="stav_popis" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="vlastnik" type="string" multiValued="false" indexed="true" stored="true"/>


<field name="cas_vydani" type="pint" multiValued="false" indexed="true" stored="true"/>
<field name="cas_vydani_str" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="cislo" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="datum_vydani" type="rdate" multiValued="false" indexed="true" stored="true"/>
<!-- datum_vydani_den ma format yyyymmdd -->
<field name="datum_vydani_den" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="datum_vydani_str" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="digitalizovano" type="booleans"/>
<field name="druhe_cislo" type="pint" multiValued="false" indexed="true" stored="true"/>

<field name="fyzicka_jednotka" type="string" multiValued="true" indexed="true" stored="true"/>

<field name="id" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
<field name="id_issue" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
<field name="id_titul" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="indextime" type="pdate" default="NOW" multiValued="false" indexed="true" stored="true"/>
<field name="isPriloha" type="boolean" multiValued="false" indexed="true" stored="true"/>
<field name="meta_nazev" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="missing_number" type="boolean" uninvertible="false" default="" indexed="true" stored="true"/>
<field name="mutace" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="nazev" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="meta_nazev" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="nazev_prilohy" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="numExists" type="boolean" multiValued="false" indexed="true" stored="true"/>
<field name="oznaceni" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="pages" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="pagesRange" type="string" multiValued="true" indexed="true" stored="true"/>
<field name="periodicita" type="string" multiValued="false" indexed="true" stored="true"/>

<field name="pocet_stran" type="pint" multiValued="false" indexed="true" stored="true"/>
<field name="podnazev" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="popis_oznaceni_vydani" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="poznamka" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="rocnik" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="signatura" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="state" type="string" multiValued="false" indexed="true" stored="true"/>

<field name="stav" type="string" multiValued="true" indexed="true" stored="true"/>
<field name="stav_popis" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="typ" type="string" multiValued="false" indexed="true" stored="true"/>

<field name="vlastnik" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="vydani" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="znak_oznaceni_vydani" type="string" multiValued="false" indexed="true" stored="true"/>
<field name="isPriloha" type="boolean" multiValued="false" indexed="true" stored="true"/>
<field name="nazev_prilohy" type="string" multiValued="false" indexed="true" stored="true"/>


</schema>
</schema>
2 changes: 1 addition & 1 deletion solr/exemplar/conf/solrconfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>7.3.1</luceneMatchVersion>
<luceneMatchVersion>8.11.2</luceneMatchVersion>

<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Expand Down
172 changes: 0 additions & 172 deletions solr/issue/conf/lang/stopwords_cz.txt
View file

This file was deleted.

Loading

0 comments on commit 0c098ac

Please sign in to comment.