Changeset 6 for trunk/cleanup.php

Timestamp:

Apr 22, 2015, 10:27:05 PM (9 years ago)

Author:

gegorbet

Message:

changes since 2013, mostly for airvata/thrift

File:

• trunk/cleanup.php (modified) (6 diffs)

trunk/cleanup.php

@@ -7 +7 @@
  */
 
-include_once "/home/us3/bin/listen-config.php";
+include_once "/export/home/us3/bin/listen-config.php";
 $me              = 'cleanup.php';
 $email_address   = '';
@@ -16 +16 @@
 $status          = '';
 
-function gfac_cleanup( $us3_db, $requestID, $gfac_link )
+function gfac_cleanup( $us3_db, $reqID, $gfac_link )
 {
    global $dbhost;
@@ -34 +34 @@
    global $status;
    global $stdout;
-
+   global $requestID;
+
+   $requestID = $reqID;
    $db = $us3_db;
    write_log( "$me: debug db=$db; requestID=$requestID" );
@@ -468 +470 @@
       $query = "UPDATE noise SET "                                                 .
                "editedDataID="                                                     .
-               "(SELECT editedDataID FROM editedData WHERE editGUID='$editGUID')," .
+               "(SELECT editedDataID FROM model WHERE modelGUID='$modelGUID'),"    .
                "modelID="                                                          .
                "(SELECT modelID FROM model WHERE modelGUID='$modelGUID')"          .
@@ -529 +531 @@
    global $org_name;
    global $admin_email;
+   global $db;
    global $dbhost;
    global $requestID;
@@ -593 +596 @@
    Submission Time : $submittime
    Analysis ID     : $gfacID
+   Request ID      : $requestID  ( $db )
    RunID           : $runID
    EditID          : $editID