Changeset 8285

Timestamp:

Aug 10, 2006, 4:10:52 PM (20 years ago)

Author:

jhoblitt

Message:

improved comments

File:

• trunk/ippTools/src/regtool.c (modified) (10 diffs)

trunk/ippTools/src/regtool.c

@@ -62 +62 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    // return only exps that are not in rawScienceExp or rawDetrendExp and have
-    // ALL of their imfiles in rawImfile (by count) and have no associated
-    // imfiles left in newImfile
+    // return only exps that:
+    // are not in rawScienceExp 
+    // are not in rawDetrendExp 
+    // have ALL of their imfiles in rawImfile (by count)
+    // and have no associated imfiles left in newImfile
 
     char *query =
@@ -116 +118 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    // select newImfiles who's exp_id is in newExp AND don't have their exp_id
-    // in rawScienceExp or rawDetrendExp
+    // select newImfiles that:
+    // exp_id is in newExp
+    // don't have their exp_id in rawScienceExp 
+    // don't have their exp_id in rawDetrendExp
     // XXX having the same exp_id in newExp and raw*Exp is probably an error
     // that should be checked for
@@ -328 +332 @@
         psArray *rawImfiles = NULL;
         {
+            // build a query to search by exp_id
             psMetadata *where = psMetadataAlloc();
             if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", newExp->exp_id)) {
@@ -343 +348 @@
             psFree(where);
         }
-        // sanity check the number of rawImfiles found
+        // sanity check that least results were found
         if (!rawImfiles) {
             // rollback
@@ -354 +359 @@
             return false;
         }
+        // sanity check the number of rawImfiles found
         if (psArrayLength(rawImfiles) != newExp->imfiles) {
             // rollback
@@ -416 +422 @@
     char *whereClaus = NULL;
     {
+        // build a query to search by exp_id, class, class_id
         psMetadata *where = psMetadataAlloc();
         bool status = false;
@@ -485 +492 @@
 
         for (long i = 0; i < psArrayLength(newImfiles); i++) {
+            // convert newImfile metadata -> newImfile object
             newImfileRow *object = newImfileObjectFromMetadata(newImfiles->data[i]);
+            // convert newImfile object -> rawImfile object
             rawImfileRow *imfile = newToRawImfile(config, object); 
             if (!imfile) {
@@ -497 +506 @@
                 return false;
             }
+            // insert the rawImfile object into the database
             if (!rawImfileInsertObject(config->dbh, imfile)) {
                 // rollback
@@ -509 +519 @@
             }
             psFree(imfile);
+            // remove the neImfile object from the database
             if (!newImfileDeleteObject(config->dbh, object)) {
                 // rollback
@@ -539 +550 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // find all rawImfiles matching the default query
     psArray *rawImfiles = rawImfileSelectRowObjects(config->dbh, config->where, 0);
     if (!rawImfiles) {