Changeset 3899 for trunk/tools/database/db.cpp

Timestamp:

Jul 29, 2000, 4:12:47 PM (25 years ago)

Author:

bird

Message:

Updates the file column in the function table.

File:

• trunk/tools/database/db.cpp (modified) (9 diffs)

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.16 2000-07-21 21:09:44 bird Exp $ *
+/* $Id: db.cpp,v 1.17 2000-07-29 14:12:47 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -905 +905 @@
     for (k = 0; k < pFnDesc->cRefCodes; k++)
     {
-        BOOL    f = FALSE;
-
-        /*
-         * Set updated flag
-         */
-        sprintf(pszQuery, "UPDATE function SET updated = updated + 1 WHERE refcode = %ld",
-                pFnDesc->alRefCode[k]);
-        rc = mysql_queryu1(pmysql, pszQuery2);
-
-
         /*
          * Get current status
@@ -922 +912 @@
         {
             strcpy(pszError, dbGetLastErrorDesc());
+            /*
+             * Set updated flag
+             */
+            sprintf(pszQuery, "UPDATE function SET updated = updated + 1 WHERE refcode = %ld",
+                    pFnDesc->alRefCode[k]);
+            rc = mysql_queryu1(pmysql, pszQuery2);
             free(pszQuery2);
             return 1;
@@ -930 +926 @@
          * Update function table first
          */
-        strcpy(pszQuery, "UPDATE function SET ");
+        strcpy(pszQuery, "UPDATE function SET updated = updated + 1");
         pszQuery += strlen(pszQuery);
 
@@ -936 +932 @@
         if (lCurrentState != pFnDesc->lStatus
             && pFnDesc->lStatus != 0
-            && (lCurrentState == 0 || pFnDesc->lStatus != 99))
-        {
-            sprintf(pszQuery, "state = %ld", pFnDesc->lStatus);
-            f = TRUE;
-        }
-        pszQuery += strlen(pszQuery);
+            && (lCurrentState == 0 || pFnDesc->lStatus != 99)
+            )
+            pszQuery += sprintf(pszQuery, ", state = %ld", pFnDesc->lStatus);
+
+        /* File */
+        if (pFnDesc->lFile >= 0)
+            pszQuery += sprintf(pszQuery, ", file = %ld", pFnDesc->lFile);
+        else
+            pszQuery += sprintf(pszQuery, ", file = -1");
 
         /* return type */
         if (pFnDesc->pszReturnType != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery, "return = ",  pFnDesc->pszReturnType);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery, ", return = ",  pFnDesc->pszReturnType);
+        else
+            pszQuery += sprintf(pszQuery, ", return = NULL");
 
         /* Description */
         if (pFnDesc->pszDescription != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery, "description  = ", pFnDesc->pszDescription);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery, ", description  = ", pFnDesc->pszDescription);
+        else
+            pszQuery += sprintf(pszQuery, ", description = NULL");
 
         /* Remark */
         if (pFnDesc->pszRemark != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery,  "remark = ", pFnDesc->pszRemark);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery, ", remark = ", pFnDesc->pszRemark);
+        else
+            pszQuery += sprintf(pszQuery, ", remark = NULL");
 
         /* Description */
         if (pFnDesc->pszReturnDesc != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery,  "returndesc = ", pFnDesc->pszReturnDesc);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery,  ", returndesc = ", pFnDesc->pszReturnDesc);
+        else
+            pszQuery += sprintf(pszQuery, ", returndesc = NULL");
 
         /* Sketch */
         if (pFnDesc->pszSketch != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery,  "sketch = ", pFnDesc->pszSketch);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery,  ", sketch = ", pFnDesc->pszSketch);
+        else
+            pszQuery += sprintf(pszQuery, ", sketch = NULL");
 
         /* Equiv */
         if (pFnDesc->pszEquiv != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery,  "equiv = ", pFnDesc->pszEquiv);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery,  ", equiv = ", pFnDesc->pszEquiv);
+        else
+            pszQuery += sprintf(pszQuery, ", equiv = NULL");
 
         /* Time */
         if (pFnDesc->pszTime != NULL)
-        {
-            if (f)  strcat(pszQuery, ", ");
-            pszQuery = sqlstrcat(pszQuery,  "time = ", pFnDesc->pszTime);
-            f = TRUE;
-        }
+            pszQuery = sqlstrcat(pszQuery,  ", time = ", pFnDesc->pszTime);
+        else
+            pszQuery += sprintf(pszQuery, ", time = NULL");
 
         /* Execute update query? */
-        if (f)
-        {
-            sprintf(pszQuery + strlen(pszQuery), " WHERE refcode = %ld", pFnDesc->alRefCode[k]);
-            rc = mysql_queryu2(pmysql, pszQuery2);
-            if (rc < 0)
-            {
-                sprintf(pszError, "Updating functiontable failed with error: %s - (sql=%s) ",
-                        dbGetLastErrorDesc(), pszQuery2);
-                pszError += strlen(pszError) - 1;
-                ulRc++;
-            }
-        }
-
+        sprintf(pszQuery + strlen(pszQuery), " WHERE refcode = %ld", pFnDesc->alRefCode[k]);
+        rc = mysql_queryu2(pmysql, pszQuery2);
+        if (rc < 0)
+        {
+            sprintf(pszError, "Updating functiontable failed with error: %s - (sql=%s) ",
+                    dbGetLastErrorDesc(), pszQuery2);
+            pszError += strlen(pszError) - 1;
+            ulRc++;
+        }
 
 
@@ -1044 +1025 @@
                             if (*pszError == ' ')
                                 strcpy(pszError++, "\n\t");
-                            sprintf(pszError, "Updateing parameter %i failed with error: %s - (sql=%s) ",
+                            sprintf(pszError, "Updating parameter %i failed with error: %s - (sql=%s) ",
                                     i, dbGetLastErrorDesc(), pszQuery);
                             pszError += strlen(pszError) - 1;
@@ -2020 +2001 @@
  * @param       lDll    The refcode of the dll owning the functions.
  * @param       fAll    All function. If FALSE then only APIs and Internal APIs.
- * @sketch      Select all functions which has updated = 0 and dll = lDll.
+ * @sketch      Select all functions which wan't updated (ie. updated = 0 and dll = lDll).
+ *              If anyone Then
  *                  Delete the referenced to the functions in:
  *                      parameters
  *                      fnauthor
- *              Delete all function which has updated = 0 and dll = lDll
- *
+ *                  Delete all function which wasn't updated.
+ *              EndIf
  * @remark      Use with GREATE CARE!
  */
@@ -2042 +2024 @@
     rc = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
+
     if (pres != NULL && mysql_num_rows(pres))
     {
@@ -2057 +2040 @@
             if (rc) fRc = FALSE;
         }
-    }
-
-    sprintf(&szQuery[0],
-            "DELETE FROM function WHERE dll = %ld AND updated = 0",
-            lDll);
-    if (!fAll)
-        strcat(&szQuery[0], " AND type IN ('A', 'I')");
-    rc = mysql_query(pmysql, &szQuery[0]);
-    if (rc) fRc = FALSE;
+
+        /*
+         * Delete the functions only if above completed without errors.
+         *
+         * Deleting the functions before all the references has successfully be
+         * deleted causes database corruption!
+         */
+        if (fRc)
+        {
+            sprintf(&szQuery[0],
+                    "DELETE FROM function WHERE dll = %ld AND updated = 0",
+                    lDll);
+            if (!fAll)
+                strcat(&szQuery[0], " AND type IN ('A', 'I')");
+            rc = mysql_query(pmysql, &szQuery[0]);
+            if (rc) fRc = FALSE;
+        }
+    }
 
     return fRc;