Changeset 6274

Timestamp:

Jan 31, 2006, 6:51:00 PM (20 years ago)

Author:

jhoblitt

Message:

don't abort all creation/deletions if a single operation fails

File:

• trunk/ippTools/src/pxtables.c (modified) (3 diffs)

trunk/ippTools/src/pxtables.c

@@ -2 +2 @@
 
 bool pxCreateTables(pxConfig *config) {
+    bool            status = true;
+
     PS_ASSERT_PTR_NON_NULL(config, false);
 
     if (!newExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!newImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawScienceExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawDetrendExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawDetrendImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p1PendingExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2PendingExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2PendingImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2DoneExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2DoneImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p3PendingExpCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!masterDetrendFramesCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!masterDetrendImfileCreateTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
 
@@ -65 +67 @@
 
 bool pxDeleteTables(pxConfig *config) {
+    bool            status = true;
     char line[128], answer[128];
 
@@ -82 +85 @@
     sscanf (line, "%s", answer);
              
-    bool status;
-    psString dbPassword = psMetadataLookupStr(&status, config->site, "DBPASSWORD");
-    if (strcmp (answer, dbPassword)) goto escape;
-    psFree(dbPassword);
+    {
+        bool status;
+        psString dbPassword = psMetadataLookupStr(&status, config->site, "DBPASSWORD");
+        if (strcmp (answer, dbPassword)) goto escape;
+        psFree(dbPassword);
+    }
 
     if (!newExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!newImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawScienceExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawDetrendExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!rawDetrendImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p1PendingExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2PendingExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2PendingImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2DoneExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p2DoneImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!p3PendingExpDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!masterDetrendFramesDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
     if (!masterDetrendImfileDropTable(config->database)) {
         psError(PS_ERR_UNKNOWN, false, "database access failed");
-        return false;
+        status = false;
     }
 
-    return true;
+    return status;
 
 escape: