svn commit: r1172061 - in /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo: DataSourceWorkflowInstanceRepository.java LuceneWorkflowInstanceRepository.java

[ma...@apache.org]

Author: mattmann
Date: Sat Sep 17 20:24:33 2011
New Revision: 1172061

URL: http://svn.apache.org/viewvc?rev=1172061&view=rev
Log:
- fix for OODT-317 Workflow Priority Sorting

Modified:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java

Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java?rev=1172061&r1=1172060&r2=1172061&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/DataSourceWorkflowInstanceRepository.java Sat Sep 17 20:24:33 2011
@@ -103,12 +103,12 @@ public class DataSourceWorkflowInstanceR
             startWorkflowSql = "INSERT INTO workflow_instances "
                     + "(workflow_instance_status, workflow_id, current_task_id,"
                     + "start_date_time, end_date_time, current_task_start_date_time,"
-                    + "current_task_end_date_time) " + "VALUES ('"
+                    + "current_task_end_date_time, priority) " + "VALUES ('"
                     + wInst.getStatus() + "', " + workflowIdField + ","
                     + taskIdField + ", '" + wInst.getStartDateTimeIsoStr()
                     + "','" + wInst.getEndDateTimeIsoStr() + "','"
                     + wInst.getCurrentTaskStartDateTimeIsoStr() + "','"
-                    + wInst.getCurrentTaskEndDateTimeIsoStr() + "')";
+                    + wInst.getCurrentTaskEndDateTimeIsoStr() + "', "+wInst.getPriority().getValue()+")";
 
             LOG.log(Level.FINE, "sql: Executing: " + startWorkflowSql);
             statement.execute(startWorkflowSql);
@@ -210,7 +210,9 @@ public class DataSourceWorkflowInstanceR
                     + wInst.getCurrentTaskStartDateTimeIsoStr()
                     + "',current_task_end_date_time='"
                     + wInst.getCurrentTaskEndDateTimeIsoStr()
-                    + "' WHERE workflow_instance_id = " + wInst.getId();
+                    + "',priority="
+                    + wInst.getPriority().getValue()
+                    +" WHERE workflow_instance_id = " + wInst.getId();
 
             LOG.log(Level.FINE, "updateStatusSql: Executing: "
                     + updateStatusSql);

Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java?rev=1172061&r1=1172060&r2=1172061&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java Sat Sep 17 20:24:33 2011
@@ -20,6 +20,7 @@ package org.apache.oodt.cas.workflow.ins
 
 //OODT imports
 import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.structs.Priority;
 import org.apache.oodt.cas.workflow.structs.Workflow;
 import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
 import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
@@ -503,6 +504,12 @@ public class LuceneWorkflowInstanceRepos
                 .getEndDateTimeIsoStr() != null ? workflowInst
                 .getEndDateTimeIsoStr() : "", Field.Store.YES,
                 Field.Index.UN_TOKENIZED));
+        doc.add(new Field("workflow_inst_priority",
+            workflowInst.getPriority() != null ? 
+                String.valueOf(workflowInst.getPriority().getValue()):
+                  String.valueOf(Priority.getDefault().getValue()),
+                  Field.Store.YES,
+                  Field.Index.UN_TOKENIZED));
 
         // add all metadata
         addInstanceMetadataToDoc(doc, workflowInst.getSharedContext());
@@ -624,6 +631,7 @@ public class LuceneWorkflowInstanceRepos
                 .get("workflow_inst_currenttask_enddatetime"));
         inst.setStartDateTimeIsoStr(doc.get("workflow_inst_startdatetime"));
         inst.setEndDateTimeIsoStr(doc.get("workflow_inst_enddatetime"));
+        inst.setPriority(Priority.getPriority(Double.valueOf(doc.get("workflow_inst_priority"))));
 
         // read the workflow instance metadata
         Metadata sharedContext = new Metadata();