ENH: refs #301 Added relation type

Added margin in upload forms

Author: Charles Ma

core/public/css/upload/upload.simpleupload.css

@@ -12,19 +12,23 @@ width:94%!important;
 
 }
 #jqueryFileUploadContent{
-  
+
 }
 
 div.tooBigUpload{
   display:none;
 }
 
 /* -- Form Styles ------------------------------- */
-#swfuploadContent form {	
+#swfuploadContent form {
 	margin: 0;
 	padding: 0;
 }
 
+.globalButton{
+  margin-top: 3px!important;
+}
+
 
 
 #swfuploadContent div.fieldset {
@@ -68,8 +72,8 @@ div.tooBigUpload{
 #swfuploadContent button,
 #swfuploadContent input,
 #swfuploadContent select,
-#swfuploadContent textarea { 
-	border-width: 1px; 
+#swfuploadContent textarea {
+	border-width: 1px;
 	margin-bottom: 10px;
 	padding: 2px 3px;
 }
@@ -79,9 +83,9 @@ div.tooBigUpload{
 #swfuploadContent input[disabled]{ border: 1px solid #ccc } /* FF 2 Fix */
 
 
-#swfuploadContent label { 
-	width: 150px; 
-	text-align: right; 
+#swfuploadContent label {
+	width: 150px;
+	text-align: right;
 	display:block;
 	margin-right: 5px;
 }
@@ -142,7 +146,7 @@ div.tooBigUpload{
 	white-space: nowrap;
 	overflow: hidden;
   display: inline;
-  
+
 }
 
 #swfuploadContent .progressBarInProgress,

modules/remoteprocessing/Notification.php

@@ -151,7 +151,7 @@ public function processProcessingResults($params)
         {
         $tmpArray = array_reverse(explode('.', basename($filepath)));
         $item = $uploadComponent->createUploadedItem($userDao, basename($filepath), $filepath, $folder);
-        $jobModel->addItemRelation($job, $item);
+        $jobModel->addItemRelation($job, $item, MIDAS_REMOTEPROCESSING_RELATION_TYPE_OUPUT);
 
         // add parameter metadata
         if(is_numeric($tmpArray[1]) && isset($params['parametersList']) && isset($params['optionMatrix']))
@@ -178,7 +178,7 @@ public function processProcessingResults($params)
       $logFile = BASE_PATH.'/tmp/misc/'.uniqid();
       file_put_contents($logFile, $params['log']);
       $item = $uploadComponent->createUploadedItem($userDao, 'log.txt', $logFile, $folder);
-      $jobModel->addItemRelation($job, $item);
+      $jobModel->addItemRelation($job, $item, MIDAS_REMOTEPROCESSING_RELATION_TYPE_OUPUT);
       unlink($logFile);
       }
     }
@@ -227,7 +227,7 @@ public function addJob($params)
         $item = $this->Item->load($itemId);
         if($item != false)
           {
-          $this->Remoteprocessing_Job->addItemRelation($job, $item);
+          $this->Remoteprocessing_Job->addItemRelation($job, $item, MIDAS_REMOTEPROCESSING_RELATION_TYPE_INPUT);
           }
         }
       }

modules/remoteprocessing/configs/module.ini

@@ -7,5 +7,6 @@ fullname= Remote processing
 description=
 ;Category
 category = Processing
+dependencies= scheduler,visualization,api
 
 securitykey = ''

modules/remoteprocessing/constant/module.php

@@ -15,4 +15,8 @@
 define("MIDAS_REMOTEPROCESSING_STATUS_WAIT", 0);
 define("MIDAS_REMOTEPROCESSING_STATUS_STARTED", 1);
 define("MIDAS_REMOTEPROCESSING_STATUS_DONE", 2);
+
+define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_EXECUTABLE", 0);
+define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_INPUT", 1);
+define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_OUPUT", 2);
 ?>

modules/remoteprocessing/database/mysql/1.0.0.sql

@@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `remoteprocessing_job` (
 
 CREATE TABLE IF NOT EXISTS `remoteprocessing_job2item` (
   `job_id` bigint(20) NOT NULL,
-  `item_id` bigint(20) NOT NULL
+  `item_id` bigint(20) NOT NULL,
+  `type` tinyint(4) NOT NULL DEFAULT 0,
 );
 

modules/remoteprocessing/models/dao/JobDao.php

@@ -17,4 +17,9 @@ class Remoteprocessing_JobDao extends Remoteprocessing_AppDao
   public $_module = 'remoteprocessing';
 
 
+  /** get Items */
+  function getItems()
+    {
+    return $this->getModel()->getRelatedItems($this);
+    }
   }

modules/remoteprocessing/models/pdo/JobModel.php

@@ -40,8 +40,38 @@ function getBy($os, $condition, $expiration_date = false, $status = MIDAS_REMOTE
     return $return;
     }
 
+  /** get Related Items */
+  function getRelatedItems($job)
+    {
+    if(!$job instanceof Remoteprocessing_JobDao)
+      {
+      throw new Zend_Exception("Should be an item.");
+      }
+
+    $sql = $this->database->select()
+          ->from('remoteprocessing_job2item')
+          ->setIntegrityCheck(false)
+          ->where('job_id = ?', $job->getKey())
+          ->order('item_id DESC');
+
+    $loader = new MIDAS_ModelLoader();
+    $itemModel = $loader->loadModel('Item');
+    $rowset = $this->database->fetchAll($sql);
+    $return = array();
+    foreach($rowset as $row)
+      {
+      $tmpDao = $itemModel->load($row['item_id']);
+      if($tmpDao != false)
+        {
+        $return[] = $tmpDao;
+        unset($tmpDao);
+        }
+      }
+    return $return;
+    }
+
   /** add item relation*/
-  function addItemRelation($job, $item)
+  function addItemRelation($job, $item, $type = MIDAS_REMOTEPROCESSING_RELATION_TYPE_EXECUTABLE)
     {
     if(!$job instanceof Remoteprocessing_JobDao)
       {
@@ -51,7 +81,15 @@ function addItemRelation($job, $item)
       {
       throw new Zend_Exception("Should be an item.");
       }
+    if(!is_numeric($type))
+      {
+      throw new Zend_Exception("Should be a number.");
+      }
     $this->database->link('items', $job, $item);
+
+    // sql because the query is simple and it
+    $data = array('type' => $type);
+    $this->database->update('remoteprocessing_job2item', $data, 'job_id = '.$job->getKey().' AND item_id = '.$item->getKey());
     }
 
   /** get related job */