Commit 28d133ab authored by Michael Ritter's avatar Michael Ritter

Pass correct attribute when requesting TokenImportStatus

parent bbdacd08
......@@ -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");
......
......@@ -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);
}
}
......
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment