Changeset 30584

Timestamp:

Feb 11, 2011, 3:52:50 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20101205/ippTools/src/regtool.c (modified) (4 diffs)

branches/eam_branches/ipp-20101205/ippTools/src/regtool.c

@@ -211 +211 @@
   // convert regular class_id format to summitImfile.class_id format
   rep = psStringCopy(class_id);
-  psFree(class_id);
+
   class_id = rep;
   
@@ -370 +370 @@
     char *tmp_id = psMetadataLookupStr(&status,row,"summit_class_id");
     if (!status) {
-      //      fprintf (stderr, "incomplete on %s\n", psMetadataLookupStr(NULL,row,"exp_name"));
+            fprintf (stderr, "incomplete on %s\n", psMetadataLookupStr(NULL,row,"exp_name"));
         continue;
     }
@@ -440 +440 @@
         already_burned = false;
 
-        //      fprintf (stderr, "missing uri: %s %s\n", psMetadataLookupStr(NULL,row,"exp_name"), this_class_id);
+        fprintf (stderr, "missing uri: %s %s\n", psMetadataLookupStr(NULL,row,"exp_name"), this_class_id);
 
         // Save this round for next round.
@@ -1903 +1903 @@
   psFree(query);
   query = rep;
-  psStringSubstitute(&class_id,"ota","XY");
   psStringSubstitute(&query,class_id,"@CLASS_ID@");
-    
+  psStringSubstitute(&query,"ota","XY");
+  
   if (!date) {
     if (!dateobs_begin || !dateobs_end) {