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

Timestamp:

Feb 14, 2000, 6:18:31 PM (26 years ago)

Author:

bird

Message:

Bugfixes. Nearly there now!

File:

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

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.9 2000-02-14 13:49:13 bird Exp $ *
+/* $Id: db.cpp,v 1.10 2000-02-14 17:18:31 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -412 +412 @@
     MYSQL_ROW    row;
     int          rc;
-    char         szQuery[256];
+    char         szQuery[1024];
 
     /*
@@ -449 +449 @@
             if (lDll >= 0 && pFnFindBuf->cFns != 0)
             {
-                int cFnsThisDll, cFnsAliasesAndThisDll, i;
+                int cFnsThisDll, cFnsAliasesAndThisDll, i, f;
 
                 /*
@@ -547 +547 @@
                                          */
                                         sprintf(&szQuery[0], "UPDATE function SET aliasfn = (-2) "
-                                                             "WHERE (",
+                                                             "WHERE refcode IN (",
                                                 lDll, pszFunctionName);
-                                        for (i = 0; i < cFnsThisDll; i++)
-                                        {
-                                            if (i != 0) strcat(&szQuery[0], " OR");
-                                            sprintf(&szQuery[strlen(szQuery)], " refcode = %ld", pFnFindBuf->alRefCode[i]);
-                                        }
+                                        for (f = 0, i = 0; i < cFnsThisDll; i++)
+                                            if (pFnFindBuf->alAliasFn[i] != ALIAS_DONTMIND)
+                                                sprintf(&szQuery[strlen(&szQuery[0])],
+                                                        f++ != 0 ? ", %ld" : "%ld", pFnFindBuf->alRefCode[i]);
                                         strcat(&szQuery[0], ") AND aliasfn <> (-2)");
-
-                                        rc = mysql_query5(pmysql, &szQuery[0]);
+                                        if (f > 0)
+                                            rc = mysql_query5(pmysql, &szQuery[0]);
+                                        else
+                                            rc = 0;
                                         if (rc >= 0 && cFnsAliasesAndThisDll < pFnFindBuf->cFns)
                                         {
@@ -566 +567 @@
                                                     pFnFindBuf->alRefCode[0]);
                                             for (i = cFnsAliasesAndThisDll; i < pFnFindBuf->cFns; i++)
+                                            {
                                                 sprintf(&szQuery[strlen(&szQuery[0])],
-                                                        i > 0 ? ", %ld" : "%ld", pFnFindBuf->alRefCode[i]);
+                                                        i > cFnsAliasesAndThisDll ? ", %ld" : "%ld", pFnFindBuf->alRefCode[i]);
+                                            }
                                             strcat(&szQuery[0], ")");
                                             rc = mysql_query6(pmysql, &szQuery[0]);
@@ -780 +783 @@
                     {
                         sprintf(pszQuery, "UPDATE parameter SET type = '%s', name = '%s' "
-                                "WHERE function = (%ld) AND sequencenbr == (%ld)",
+                                "WHERE function = (%ld) AND sequencenbr = (%ld)",
                                 pFnDesc->apszParamType[i] != NULL ? pFnDesc->apszParamType[i] : "",
                                 pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : "",