Changeset 30118 for branches/czw_branch/20101203/ippTools/src/regtool.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTools (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/regtool.c (modified) (4 diffs)

branches/czw_branch/20101203/ippTools/src/regtool.c

@@ -300 +300 @@
   psStringSubstitute(&query,date,"@DATE@");
 
-  fprintf(stderr,"%s",query);
+  //  fprintf(stderr,"%s",query);
 
   if (!p_psDBRunQuery(config->dbh, query)) {
@@ -349 +349 @@
       psMetadataAddStr(row,PS_LIST_TAIL,"previous_class_id",PS_META_REPLACE,"",previous_class_id);
     }
-    
+    // class_id = NULL sorts to the top of the list, so skip those (incomplete downloads)
+    if (!this_class_id) {
+      continue;
+    }
     // Determine if we've crossed a class_id boundary, as this resets the bits.
     if (previous_class_id) {
@@ -370 +373 @@
     if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)||
         (psMetadataLookupS32(NULL,row,"is_registered") != 1)) {
+      //      printf("I claim this isn't downloaded or registered? %s %s\n",this_uri,this_class_id);
       ok_to_burn = false;
     }
     if (already_burned == false) {
+      //      printf("already_burned looks false %s %s\n",this_uri,this_class_id);
       ok_to_burn = false;
     }
@@ -398 +403 @@
     }      
 
-    //    printf("STATUS: %s %s %s %s (%d %d)\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned);
+    //    printf("STATUS: %s %s %s %s (%d %d) %d %d %d\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned,psMetadataLookupS32(NULL,row,"burntool_state"),psMetadataLookupS32(NULL,row,"is_registered"),psMetadataLookupS32(NULL,row,"is_downloaded"));
 
     // If the state of this imfile is not "pending_burntool" then we can't burn it.