Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
A
ace
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
36
Issues
36
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
adapt
ace
Commits
1858eb18
Commit
1858eb18
authored
May 24, 2018
by
Michael Ritter
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release-1.13-fix' into 'master'
Merge 1.13-fix See merge request
!10
parents
123c6d17
28d133ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
ace-am/src/main/java/edu/umiacs/ace/monitor/register/ImportStatusServlet.java
.../edu/umiacs/ace/monitor/register/ImportStatusServlet.java
+3
-1
ace-am/src/main/java/edu/umiacs/ace/monitor/register/IngestThread.java
...in/java/edu/umiacs/ace/monitor/register/IngestThread.java
+0
-3
ace-am/src/main/webapp/ingeststatus.jsp
ace-am/src/main/webapp/ingeststatus.jsp
+8
-8
No files found.
ace-am/src/main/java/edu/umiacs/ace/monitor/register/ImportStatusServlet.java
View file @
1858eb18
...
...
@@ -32,7 +32,9 @@ public class ImportStatusServlet extends EntityManagerServlet {
KSFuture
<
IngestSupervisor
>
ksSupervisor
=
pool
.
getCache
().
get
(
collection
);
if
(
ksSupervisor
!=
null
)
{
request
.
setAttribute
(
ACTIVE_PARAM
,
ksSupervisor
.
getKnownResult
());
request
.
setAttribute
(
ACTIVE_PARAM
,
ksSupervisor
.
getKnownResult
().
getThread
());
}
else
{
LOG
.
debug
(
"Collection has a null supervisor!"
);
}
}
else
{
LOG
.
debug
(
"Collection "
+
id
+
" does not exist"
);
...
...
ace-am/src/main/java/edu/umiacs/ace/monitor/register/IngestThread.java
View file @
1858eb18
...
...
@@ -150,7 +150,6 @@ public class IngestThread extends RecursiveAction {
em
.
persist
(
item
);
numTransactions
+=
3
;
// stateMap.put(identifier, IngestState.NEW);
states
.
get
(
IngestState
.
NEW
).
add
(
identifier
);
}
else
{
LOG
.
debug
(
"[Ingest Thread "
+
Thread
.
currentThread
().
getId
()
...
...
@@ -204,10 +203,8 @@ public class IngestThread extends RecursiveAction {
numTransactions
+=
2
;
states
.
get
(
IngestState
.
UPDATED
).
add
(
identifier
);
// stateMap.put(identifier, IngestState.UPDATED);
}
else
{
states
.
get
(
IngestState
.
MATCH
).
add
(
identifier
);
// stateMap.put(identifier, IngestState.MATCH);
}
}
...
...
ace-am/src/main/webapp/ingeststatus.jsp
View file @
1858eb18
...
...
@@ -56,25 +56,25 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<a
class=
"nav-link active"
id=
"pills-queued-tab"
role=
"tab"
href=
"#pills-queued"
data-toggle=
"pill"
aria-controls=
"pills-queued"
aria-selected=
"true"
>
Queued
(${
supervisor
.queuedSize})
</a>
(${
active
.queuedSize})
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link"
id=
"pills-new-tab"
role=
"tab"
href=
"#pills-new"
data-toggle=
"pill"
aria-controls=
"pills-new"
aria-selected=
"false"
>
New
(${
supervisor
.newSize})
</a>
(${
active
.newSize})
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link"
id=
"pills-updated-tab"
role=
"tab"
href=
"#pills-updated"
data-toggle=
"pill"
aria-controls=
"pills-updated"
aria-selected=
"false"
>
Updated
(${
supervisor
.updatedSize})
</a>
(${
active
.updatedSize})
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link"
id=
"pills-match-tab"
role=
"tab"
href=
"#pills-match"
data-toggle=
"pill"
aira-controls=
"pills-match"
aria-selected=
"false"
>
Matched (${
supervisor
.matchSize})
</a>
Matched (${
active
.matchSize})
</a>
</li>
<%-- Maybe in the future
...
...
@@ -91,7 +91,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
role=
"tabpanel"
aria-labelledby=
"pills-queued-tab"
>
<ul
class=
"list-group list-group-flush"
>
<c:forEach
items=
"
${
supervisor
.
queued
}
"
var=
"identifier"
>
<c:forEach
items=
"
${
active
.
queued
}
"
var=
"identifier"
>
<li
class=
"list-group-item"
>
${identifier}
</li>
</c:forEach>
</ul>
...
...
@@ -99,7 +99,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<div
class=
"tab-pane fade"
id=
"pills-new"
role=
"tabpanel"
aria-labelledby=
"pills-new-tab"
>
<ul
class=
"list-group list-group-flush"
>
<c:forEach
items=
"
${
supervisor
.
newItems
}
"
var=
"identifier"
>
<c:forEach
items=
"
${
active
.
newItems
}
"
var=
"identifier"
>
<li
class=
"list-group-item"
>
${identifier}
</li>
</c:forEach>
</ul>
...
...
@@ -107,7 +107,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<div
class=
"tab-pane fade"
id=
"pills-updated"
role=
"tabpanel"
aria-labelledby=
"pills-updated-tab"
>
<ul
class=
"list-group list-group-flush"
>
<c:forEach
items=
"
${
supervisor
.
updated
}
"
var=
"identifier"
>
<c:forEach
items=
"
${
active
.
updated
}
"
var=
"identifier"
>
<li
class=
"list-group-item"
>
${identifier}
</li>
</c:forEach>
</ul>
...
...
@@ -115,7 +115,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<div
class=
"tab-pane fade"
id=
"pills-match"
role=
"tabpanel"
aria-labelledby=
"pills-match-tab"
>
<ul
class=
"list-group list-group-flush"
>
<c:forEach
items=
"
${
supervisor
.
matched
}
"
var=
"identifier"
>
<c:forEach
items=
"
${
active
.
matched
}
"
var=
"identifier"
>
<li
class=
"list-group-item"
>
${identifier}
</li>
</c:forEach>
</ul>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment