Skip to content

Commit ece192a

Browse files
car031car031
committed
more settings for NLP models
1 parent 493d252 commit ece192a

File tree

8 files changed

+102
-23
lines changed

8 files changed

+102
-23
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ public DocumentFuture create(File file, Document docVO, DocumentHistory transact
988988

989989
/*
990990
* Better to synchronize this block because under high multi-threading
991-
* it may lead to hibernate's sessions rollbacks
991+
* it may lead to hibernate's session rollbacks
992992
*/
993993
synchronized (this) {
994994
countPages(file, docVO);

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentDAO.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ public class HibernateDocumentDAO extends HibernatePersistentObjectDAO<Document>
8888
@Resource(name = "UserDAO")
8989
private UserDAO userDAO;
9090

91+
@Resource(name = "GroupDAO")
92+
private GroupDAO groupDAO;
93+
9194
@Resource(name = "DocumentLinkDAO")
9295
private DocumentLinkDAO linkDAO;
9396

@@ -354,9 +357,8 @@ public void store(Document doc, final DocumentHistory transaction) throws Persis
354357

355358
private void removeForbiddenPermissionsForGuests(Document document) throws PersistenceException {
356359
// Remove the forbidden permissions for the guests
357-
GroupDAO gDao = Context.get(GroupDAO.class);
358360
for (DocumentAccessControlEntry ace : document.getAccessControlList()) {
359-
Group group = gDao.findById(ace.getGroupId());
361+
Group group = groupDAO.findById(ace.getGroupId());
360362
if (group != null && group.isGuest()) {
361363
ace.setArchive(0);
362364
ace.setAutomation(0);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelProperties.java‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.logicaldoc.gui.common.client.log.GuiLog;
77
import com.logicaldoc.gui.common.client.util.ItemFactory;
88
import com.smartgwt.client.data.AdvancedCriteria;
9+
import com.smartgwt.client.data.Criterion;
910
import com.smartgwt.client.types.AutoFitWidthApproach;
1011
import com.smartgwt.client.types.OperatorId;
1112
import com.smartgwt.client.types.SelectionStyle;
@@ -147,20 +148,48 @@ private void refresh() {
147148
setNeuralNetworkVisibility(batch);
148149

149150
IntegerItem seed = ItemFactory.newIntegerItem(SEED, SEED, model.getSeed());
151+
seed.addChangedHandler(changedHandler);
150152
setNeuralNetworkVisibility(seed);
151153

154+
SelectItem language = ItemFactory.newLanguageSelector("language", true, false);
155+
setNLPVisibility(language);
156+
157+
SpinnerItem cutoff = ItemFactory.newSpinnerItem("cutoff", model.getCutoff());
158+
cutoff.setMin(1);
159+
cutoff.addChangedHandler(changedHandler);
160+
setNLPVisibility(cutoff);
161+
162+
SpinnerItem ngramMin = ItemFactory.newSpinnerItem("ngrammin", model.getNgramMin());
163+
ngramMin.setMin(2);
164+
ngramMin.addChangedHandler(changedHandler);
165+
setNLPVisibility(ngramMin);
166+
167+
SpinnerItem ngramMax = ItemFactory.newSpinnerItem("ngrammax", model.getNgramMax());
168+
ngramMax.setMin(2);
169+
ngramMax.addChangedHandler(changedHandler);
170+
setNLPVisibility(ngramMax);
171+
152172
form.setItems(id, typeValue, type, name, label, features, categories, activation, weightInit, loss, batch, seed,
153-
description);
173+
cutoff, ngramMin, ngramMax, language, description);
154174

155175
container.setMembersMargin(3);
156176
container.addMember(form);
157177

158178
prepareLayers();
159179
}
160180

161-
private void setNeuralNetworkVisibility(FormItem activation) {
162-
activation.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, NEURAL));
163-
activation.setRequiredWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, NEURAL));
181+
private void setNeuralNetworkVisibility(FormItem item) {
182+
item.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, NEURAL));
183+
item.setRequiredWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, NEURAL));
184+
}
185+
186+
private void setNLPVisibility(FormItem item) {
187+
AdvancedCriteria criteria = new AdvancedCriteria(OperatorId.OR,
188+
new Criterion[] { new AdvancedCriteria(TYPE, OperatorId.EQUALS, "classifier"),
189+
new AdvancedCriteria(TYPE, OperatorId.EQUALS, "tokens") });
190+
191+
item.setVisibleWhen(criteria);
192+
item.setRequiredWhen(criteria);
164193
}
165194

166195
private SelectItem lossSeletor() {
@@ -257,8 +286,12 @@ boolean validate() {
257286
for (com.smartgwt.client.data.Record layerRecord : layerRecords)
258287
model.getLayers().add(new GUINeuralNetworkLayer(layerRecord.getAttribute(NAME),
259288
layerRecord.getAttributeAsInt(OUTPUTNODES), layerRecord.getAttribute(ACTIVATION)));
289+
} else {
290+
model.setLanguage(form.getValueAsString("language"));
291+
model.setCutoff(Integer.parseInt(form.getValueAsString("cutoff")));
292+
model.setNgramMin(Integer.parseInt(form.getValueAsString("ngrammin")));
293+
model.setNgramMax(Integer.parseInt(form.getValueAsString("ngrammax")));
260294
}
261-
262295
}
263296
return !form.hasErrors();
264297
}

‎logicaldoc-i18n/src/main/resources/i18n/messages.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2699,4 +2699,7 @@ querymodel2 = Query the model {0}
26992699
noresults = No results
27002700
modelsstoragelocation = Location of trained models
27012701
uploadmodel = Upload a Model
2702-
import = Import
2702+
import = Import
2703+
cutoff = Cutoff
2704+
ngrammin = Ngram Min
2705+
ngrammax = Ngram Max

‎logicaldoc-webapp/src/main/resources/log.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Configuration packages="com.logicaldoc.util.log4j">
33
<Properties>
4-
<Property name="root"><![CDATA[logs]]></Property>
4+
<Property name="root"><![CDATA[C:\LogicalDOC-Devel\repository\logs]]></Property>
55
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%C:%4L) -- %m%n</Property>
66
<Property name="dateformat">ISO8601</Property>
77
</Properties>
88
<Appenders>
9+
<RollingFile name="AI_ORGDEAPLEARNING4J" fileName="${root}/ai_orgdeaplearning4j.log" filePattern="${root}/ai_orgdeaplearning4j.log.%i" immediateFlush="true">
10+
<PatternLayout>
11+
<Pattern>%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p %m%n</Pattern>
12+
</PatternLayout>
13+
<Policies>
14+
<SizeBasedTriggeringPolicy size="5 MB" />
15+
</Policies>
16+
<DefaultRolloverStrategy max="5" />
17+
</RollingFile>
918
<RollingFile name="workbench_WEB" fileName="${root}/workbench_web.log.html" filePattern="${root}/workbench_web.log.html.%i">
1019
<LDHtmlLayout datePattern="${dateformat}" />
1120
<Policies>
@@ -798,7 +807,7 @@
798807
<Logger name="org.hibernate.cache" level="warn" additivity="true" />
799808
<Logger name="com.logicaldoc.importfolder" level="debug" additivity="true" />
800809
<Logger name="org.deeplearning4j" level="trace" additivity="false">
801-
<AppenderRef ref="AI_ORGDEEPLEARNING4J" level="trace" />
810+
<AppenderRef ref="AI_ORGDEAPLEARNING4J" level="trace" />
802811
<AppenderRef ref="DMS" level="error" />
803812
<AppenderRef ref="DMS_WEB" level="error" />
804813
</Logger>

‎logicaldoc-webapp/src/test/resources/log.xml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<Configuration packages="com.logicaldoc.util.log4j">
33
<Properties>
44
<Property name="root">target</Property>
5-
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) -- %m%n</Property>
5+
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) --
6+
%m%n</Property>
67
<Property name="dateformat">ISO8601</Property>
78
</Properties>
89

910
<Appenders>
10-
<RollingFile name="file" fileName="${root}/file.log" filePattern="${root}/file.log.%i">
11+
<RollingFile name="file" fileName="${root}/file.log"
12+
filePattern="${root}/file.log.%i">
1113
<PatternLayout>
1214
<Pattern>${pattern}</Pattern>
1315
</PatternLayout>
@@ -16,7 +18,8 @@
1618
</Policies>
1719
<DefaultRolloverStrategy max="1" />
1820
</RollingFile>
19-
<RollingFile name="hikari" fileName="${root}/hikari.log" filePattern="${root}/hikari.log.%i">
21+
<RollingFile name="hikari" fileName="${root}/hikari.log"
22+
filePattern="${root}/hikari.log.%i">
2023
<PatternLayout>
2124
<Pattern>${pattern}</Pattern>
2225
</PatternLayout>
@@ -55,16 +58,27 @@
5558
<Logger name="org.hsqldb" level="error" additivity="false">
5659
<AppenderRef ref="file" />
5760
</Logger>
58-
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl" level="info" additivity="false">
61+
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl"
62+
level="info" additivity="false">
5963
<AppenderRef ref="file" />
6064
</Logger>
61-
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug" additivity="false">
65+
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug"
66+
additivity="false">
6267
<AppenderRef ref="file" />
6368
</Logger>
6469
<Logger name="org.hsqldb" level="debug" additivity="false">
6570
<AppenderRef ref="file" />
6671
</Logger>
6772

73+
<Logger name="com.logicaldoc.web.websockets" level="fatal"
74+
additivity="false">
75+
<AppenderRef ref="file" />
76+
</Logger>
77+
<Logger name="org.apache.solr" level="fatal" additivity="false">
78+
<AppenderRef ref="file" />
79+
</Logger>
80+
81+
6882
<Root level="fatal">
6983
<AppenderRef ref="console" />
7084
</Root>

‎logicaldoc-webapp/src/test/resources/log4j2.xml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<Configuration packages="com.logicaldoc.util.log4j">
33
<Properties>
44
<Property name="root">target</Property>
5-
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) -- %m%n</Property>
5+
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) --
6+
%m%n</Property>
67
<Property name="dateformat">ISO8601</Property>
78
</Properties>
89

910
<Appenders>
10-
<RollingFile name="file" fileName="${root}/file.log" filePattern="${root}/file.log.%i">
11+
<RollingFile name="file" fileName="${root}/file.log"
12+
filePattern="${root}/file.log.%i">
1113
<PatternLayout>
1214
<Pattern>${pattern}</Pattern>
1315
</PatternLayout>
@@ -16,7 +18,8 @@
1618
</Policies>
1719
<DefaultRolloverStrategy max="1" />
1820
</RollingFile>
19-
<RollingFile name="hikari" fileName="${root}/hikari.log" filePattern="${root}/hikari.log.%i">
21+
<RollingFile name="hikari" fileName="${root}/hikari.log"
22+
filePattern="${root}/hikari.log.%i">
2023
<PatternLayout>
2124
<Pattern>${pattern}</Pattern>
2225
</PatternLayout>
@@ -55,20 +58,30 @@
5558
<Logger name="org.hsqldb" level="error" additivity="false">
5659
<AppenderRef ref="file" />
5760
</Logger>
58-
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl" level="info" additivity="false">
61+
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl"
62+
level="info" additivity="false">
5963
<AppenderRef ref="file" />
6064
</Logger>
61-
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug" additivity="false">
65+
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug"
66+
additivity="false">
6267
<AppenderRef ref="file" />
6368
</Logger>
6469
<Logger name="org.hsqldb" level="debug" additivity="false">
6570
<AppenderRef ref="file" />
6671
</Logger>
6772

73+
<Logger name="com.logicaldoc.web.websockets" level="fatal"
74+
additivity="false">
75+
<AppenderRef ref="file" />
76+
</Logger>
77+
<Logger name="org.apache.solr" level="fatal" additivity="false">
78+
<AppenderRef ref="file" />
79+
</Logger>
80+
81+
6882
<Root level="fatal">
6983
<AppenderRef ref="console" />
7084
</Root>
7185
</Loggers>
7286

73-
74-
</Configuration>
87+
</Configuration>

‎logicaldoc-webservice/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@
7474
<artifactId>log4j-slf4j2-impl</artifactId>
7575
<scope>provided</scope>
7676
</dependency>
77+
<dependency>
78+
<groupId>org.apache.logging.log4j</groupId>
79+
<artifactId>log4j-api</artifactId>
80+
<scope>provided</scope>
81+
</dependency>
7782

7883
<!-- CXF dependencies -->
7984
<dependency>

0 commit comments

Comments
 (0)