Changeset 30279

Timestamp:

Jan 14, 2011, 2:18:14 PM (15 years ago)

Author:

watersc1

Message:

checkburntool bugs

Location:

tags/ipp-20101215/ippTools

Files:

• share/regtool_checkburntoolimfile.sql (modified) (2 diffs)
• src/regtool.c (modified) (4 diffs)

tags/ipp-20101215/ippTools/share/regtool_checkburntoolimfile.sql

@@ -1 +1 @@
 SELECT DISTINCT
-       exp_name,
+       summitExp.exp_name,
        rawImfile.uri,
        summitExp.dateobs AS registered,
@@ -31 +31 @@
              AND summitExp.dateobs <= '@DATEOBS_END@'
              AND summitImfile.class_id = '@CLASS_ID@'
-             AND (exp_name <= '@EXP_NAME@')                                                                     
+             AND (summitExp.exp_name <= '@EXP_NAME@')                                                                     
 ORDER BY summitExp.dateobs

tags/ipp-20101215/ippTools/src/regtool.c

@@ -95 +95 @@
             psAbort("invalid option (this should not happen)");
     }
-
+    psTrace("regtool",9,"Attempting to free config\n");
     psFree(config);
     pmConfigDone();
@@ -204 +204 @@
 
   // convert regular class_id format to summitImfile.class_id format
+  rep = psStringCopy(class_id);
+  psFree(class_id);
+  class_id = rep;
+  
   psStringSubstitute(&class_id,"ota","XY");
   
@@ -211 +215 @@
   psStringSubstitute(&query,dateobs_end,"@DATEOBS_END@");
 
-  fprintf(stderr,"%s",query);
+  // fprintf(stderr,"%s",query);
 
   if (!p_psDBRunQuery(config->dbh, query)) {
@@ -237 +241 @@
   if (!psArrayLength(output)) {
     psTrace("regtool", PS_LOG_INFO, "no rows found");
-    psFree(output);
     return true;
   }