Changeset 7199

Timestamp:

May 24, 2006, 2:06:58 PM (20 years ago)

Author:

jhoblitt

Message:

change 'normalized' operations to use the detNormalizedImfile table

File:

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

trunk/ippTools/src/dettool.c

@@ -534 +534 @@
     }
 
-    // remove detMasterImfiles
-    psArray *masterImfiles = detMasterImfileSelectRowObjects(
+    // remove detNormalizedImfiles
+    psArray *masterImfiles = detNormalizedImfileSelectRowObjects(
         config->dbh, config->where, 0);
     // XXX trace the not found case
@@ -543 +543 @@
                 if (strcmp(
                 ((detStackedImfileRow *)stackedImfiles->data[i])->class_id,
-                ((detMasterImfileRow *)masterImfiles->data[j])->class_id)
+                ((detNormalizedImfileRow *)masterImfiles->data[j])->class_id)
                 == 0) {
                     // remove the detStackedImfiles from the list
@@ -799 +799 @@
     }
 
-    // create a new detMasterImfile object
-    detMasterImfileRow *masterImfile = detMasterImfileRowAlloc(
+    // create a new detNormalizedImfile object
+    detNormalizedImfileRow *masterImfile = detNormalizedImfileRowAlloc(
         (psS32)atol(det_id), class_id, uri, stats, recipe
     );   
 
     // insert the new row into the detProcessedImfile table
-    if (!detMasterImfileInsertObject(config->dbh, masterImfile)) {
+    if (!detNormalizedImfileInsertObject(config->dbh, masterImfile)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false; 
@@ -820 +820 @@
 
     psArray *masterImfiles =
-        detMasterImfileSelectRowObjects(config->dbh, config->where, 0);
+        detNormalizedImfileSelectRowObjects(config->dbh, config->where, 0);
     if (!masterImfiles) {
-        psError(PS_ERR_UNKNOWN, false, "no detMasterImfile rows found");
-        return false;
-    }
-
-    // print detMasterImfiles
+        psError(PS_ERR_UNKNOWN, false, "no detNormalizedImfile rows found");
+        return false;
+    }
+
+    // print detNormalizedImfiles
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(masterImfiles); i++) {
@@ -832 +832 @@
                 masterImfiles->data[i]);
         psMetadataAddMetadata(
-            output, PS_LIST_TAIL, "detMasterImfile", PS_META_DUPLICATE_OK,
+            output, PS_LIST_TAIL, "detNormalizedImfile", PS_META_DUPLICATE_OK,
             NULL, md
         );
@@ -857 +857 @@
     }
 
-    // find all detMasterIImfile for det_id
+    // find all detNormalizedIImfile for det_id
     // XXX det_id is requried as a simplification
     psArray *masterImfiles =
-        detMasterImfileSelectRowObjects(config->dbh, config->where, 0);
+        detNormalizedImfileSelectRowObjects(config->dbh, config->where, 0);
     if (!masterImfiles) {
-        psError(PS_ERR_UNKNOWN, false, "no detMasterImfile rows found");
+        psError(PS_ERR_UNKNOWN, false, "no detNormalizedImfile rows found");
         return false;
     }
@@ -877 +877 @@
         bool valid = false;
         for (long j = 0; j < psArrayLength(valid_class_ids); j++) {
-            if (strcmp(((detMasterImfileRow *)masterImfiles->data[i])->class_id,
+            if (strcmp(((detNormalizedImfileRow *)masterImfiles->data[i])->class_id,
                    (char *)valid_class_ids->data[j]) == 0) {
                 valid = true;
@@ -892 +892 @@
             psError(PS_ERR_UNKNOWN, true,
         "class_id %s does not corespond to a detInputExp",
-            ((detMasterImfileRow *)masterImfiles->data[i])->class_id);
+            ((detNormalizedImfileRow *)masterImfiles->data[i])->class_id);
             psFree(masterImfiles);
             psFree(valid_class_ids);
@@ -901 +901 @@
     // if we nade it this far we must have a complete frame
 
-    // print detMasterImfiles
+    // print detNormalizedImfiles
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(masterImfiles); i++) {
@@ -907 +907 @@
                 masterImfiles->data[i]);
         psMetadataAddMetadata(
-            output, PS_LIST_TAIL, "detMasterImfile", PS_META_DUPLICATE_OK,
+            output, PS_LIST_TAIL, "detNormalizedImfile", PS_META_DUPLICATE_OK,
             NULL, md
         );