Changeset 28171 for branches/haf_branches/ipp.20100512/ippTools/src

Timestamp:

Jun 1, 2010, 10:45:19 AM (16 years ago)

Author:

heather

Message:

trying to commit my changes from yesterday

Location:

branches/haf_branches/ipp.20100512/ippTools/src

Files:

• addtool.c (modified) (7 diffs)
• addtoolConfig.c (modified) (1 diff)

branches/haf_branches/ipp.20100512/ippTools/src/addtool.c

@@ -891 +891 @@
 
     
-
+    
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1085 +1085 @@
 
     psStringAppend(&query2, " AND minidvodb_group = '%s' limit 1;", minidvodb_group);
-   
+    
 
 
@@ -1114 +1114 @@
 
     return true;
-
+   
 }
 
@@ -1309 +1309 @@
 PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false);
     PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false);
-PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-mergedvodb_path", false, false);
+PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-mergedvodb_path", true, false);
+PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false);
+
     PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
     //generate restrictions
 psMetadata *where = psMetadataAlloc();
 PXOPT_COPY_S64(config->args, where, "-minidvodb_id",   "minidvodbRun.minidvodb_id",   "==");
+
+
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        
+        return false;
+    }
+
 
     psString query = pxDataGet("addtool_find_pendingmergeprocess.sql");
@@ -1346 +1356 @@
     }
     
-    if (!psDBTransaction(config->dbh)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(output);
-        return false;
-    }
+    //if (!psDBTransaction(config->dbh)) {
+    //    psError(PS_ERR_UNKNOWN, false, "database error");
+    //    psFree(output);
+    //     return false;
+    // }
         minidvodbRunRow *pendingRow = minidvodbRunObjectFromMetadata(output->data[0]);
         psFree(output);
@@ -1377 +1387 @@
         // since there is only one exp per 'new' set addRun.state = 'full'
         
-        //      psString query2 = NULL ;
-        //
-        //      psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_name = '%s'", row->minidvodb_name); 
-
-        //if (!p_psDBRunQuery(config->dbh, query2)) {
-        //  psError(PS_ERR_UNKNOWN, false, "database error");
-        //  psFree(query2);
-        //  return false;
-        //      }
-        // psArray *output2 = p_psDBFetchResult(config->dbh);
-        //  if (!output2) {
-        //psError(PS_ERR_UNKNOWN, false, "database error");
-        //return false;
-        // }
-        // if (!psArrayLength(output2)) {
-        //    psTrace("addtool", PS_LOG_INFO, "no rows found");
-        //      //     psFree(output2);
-        //    return true;
-        //  }
-
-
+                psString query2 = NULL ;
+                psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); 
         
-        //      psFree(row);
-        //      psFree(pendingRow);
-        //      
+                if (!p_psDBRunQuery(config->dbh, query2)) {
+          // rollback
+                  if (!psDBRollback(config->dbh)) {
+                    psError(PS_ERR_UNKNOWN, false, "database error");
+                  }
+                  psError(PS_ERR_UNKNOWN, false, "database error");
+                  psFree(query2);
+                  return false;
+                }
+
+                //this finds the # of merged things (for the merge order)
+                psString query3 = NULL;
+                psStringAppend(&query3, "select count(*) from minidvodbRun join minidvodbProcessed using (minidvodb_id) where state = 'merged' and minidvodb_group = '%s';", minidvodb_group);  
+        
+                if (!p_psDBRunQuery(config->dbh, query3)) {
+          // rollback
+                  if (!psDBRollback(config->dbh)) {
+                    psError(PS_ERR_UNKNOWN, false, "database error");
+                  }
+                  psError(PS_ERR_UNKNOWN, false, "database error");
+                  psFree(query3);
+                  return false;
+                }
+                psArray *output2 = p_psDBFetchResult(config->dbh);
+                if (!output2) {
+                  psError(PS_ERR_UNKNOWN, false, "database error");
+                  return false;
+                }
+                if (!psArrayLength(output2)) {
+                  psTrace("addtool", PS_LOG_INFO, "no rows found");
+                  psFree(output);
+                  return true;
+                }
+                bool status;
+                psS64 m_order = psMetadataLookupS64(&status, output2->data[0], "count(*)");
+                if (!status) { 
+                  
+                  psAbort("failed to lookup value for count column"); 
+                  return false;
+                }
+                psString final = NULL;
+                psStringAppend(&final, "%" PRIu64, m_order);
+                printf("%s", final);
+                //return false;
+
+        
+
+                psFree(query3); 
+        
+        
+                psFree(output2);
+                
+        
+                psString query4 = NULL;
+                psStringAppend(&query4, "update minidvodbProcessed set merge_order = %"PRIu64,m_order);
+                psStringAppend(&query4," where minidvodb_id = %" PRIu64,  minidvodb_id);        
+                printf("%s", query4);
+                        if (!p_psDBRunQuery(config->dbh, query4)) {
+          // rollback
+                          if (!psDBRollback(config->dbh)) {
+                            psError(PS_ERR_UNKNOWN, false, "database error");
+                          }
+                          psError(PS_ERR_UNKNOWN, false, "database error");
+                          psFree(query4);
+                          return false;
+                        }
+//      
+
+
+                psFree(query4);
+                        psFree(row);
+                        psFree(pendingRow);
+                        
         if (!psDBCommit(config->dbh)) {
           psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1408 +1469 @@
         
 
-        
+        printf("%s", final);
+        psFree(final);
         
         return true;

branches/haf_branches/ipp.20100512/ippTools/src/addtoolConfig.c

@@ -196 +196 @@
     psMetadataAddTime(addminidvodbprocessedArgs, PS_LIST_TAIL, "-epoch",         0,    "time merge is finished", NULL);
     psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-mergedvodb_path",0,    "path of merged dvodb", NULL);
+psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-minidvodb_group",0,    "minidvodb_group", NULL);
     psMetadataAddS16(addminidvodbprocessedArgs, PS_LIST_TAIL, "-fault",          0,    "set fault code", 0);