Author: mattmann
Date: Thu Oct 25 14:03:32 2012
New Revision: 1402156
URL: http://svn.apache.org/viewvc?rev=1402156&view=rev
Log:
- fix for OODT-272 Enable Removal of Finished Ingestion Tasks contributed by
Mike Joyce
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
oodt/trunk/curator/src/main/webapp/js/main.js
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1402156&r1=1402155&r2=1402156&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Thu Oct 25 14:03:32 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.5
--------------------------------------------
+* OODT-272 Enable Removal of Finished Ingestion Tasks
+ (Michael Joyce via mattmann)
+
* OODT-328 Remove jpl.nasa.gov references from code
(Michael Joyce via mattmann)
Modified:
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java?rev=1402156&r1=1402155&r2=1402156&view=diff
==============================================================================
---
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
(original)
+++
oodt/trunk/curator/src/main/java/org/apache/oodt/cas/curation/service/IngestionResource.java
Thu Oct 25 14:03:32 2012
@@ -118,6 +118,13 @@ public class IngestionResource extends C
}
@GET
+ @Path("remove")
+ @Produces("text/plain")
+ public void removeTask(@QueryParam("taskId") String ingestTaskId) {
+ this.taskList.removeIngestionTask(ingestTaskId);
+ }
+
+ @GET
@Path("list")
@Produces("text/plain")
public String getIngestTaskList(
@@ -200,12 +207,13 @@ public class IngestionResource extends C
out.append(task.getStatus());
out.append("</td>");
if (!task.getStatus().equals(IngestionTask.FINISHED)) {
- out
- .append("<td><input type=\"button\" rel=\"_taskid_\"
value=\"Start\" onclick=\"startIngestionTask('");
+ out.append("<td><input type=\"button\" rel=\"_taskid_\"
value=\"Start\" onclick=\"startIngestionTask('");
out.append(task.getId());
out.append("')\"/></td>");
} else {
- out.append("<td>N/A</td>");
+ out.append("<td><input type=\"button\" rel=\"_taskid_\"
value=\"Remove\" onclick=\"removeIngestionTask('");
+ out.append(task.getId());
+ out.append("')\"></td>");
}
out.append("</tr>");
Modified: oodt/trunk/curator/src/main/webapp/js/main.js
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/src/main/webapp/js/main.js?rev=1402156&r1=1402155&r2=1402156&view=diff
==============================================================================
--- oodt/trunk/curator/src/main/webapp/js/main.js (original)
+++ oodt/trunk/curator/src/main/webapp/js/main.js Thu Oct 25 14:03:32 2012
@@ -110,6 +110,13 @@ function createIngestionTaskRow(data) {
$('#ingestionTaskListItems > tbody').replace(data);
}
+function removeIngestionTask(id) {
+ $.get('./services/ingest/remove',
+ { 'taskId' : id },
+ refreshIngestTaskList()
+ );
+}
+
function startIngestionTask(id) {
$.get('./services/ingest/start',
{ 'taskId' : id },
@@ -119,8 +126,6 @@ function startIngestionTask(id) {
});
}
-
-
/********************************************************************
* DRAG AND DROP INITIALIZATION AND CONFIGURATION
*
