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

Timestamp:

Sep 7, 2001, 12:33:10 PM (24 years ago)

Author:

bird

Message:

reverse prev rev.

File:

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

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.26 2001-09-07 10:24:07 bird Exp $ *
+/* $Id: db.cpp,v 1.27 2001-09-07 10:31:44 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -154 +154 @@
 
 /**
- * Gets the refid for the give mod name.
- * @returns Module refid. -1 on error.
- * @param   pszModName      Module name.
- */
-signed long _System dbGetModule(const char *pszModName)
+ * Gets the refid for the give dll name.
+ * @returns   Dll refid. -1 on error.
+ * @param     pszDllName  Dll name.
+ */
+signed long _System dbGetDll(const char *pszDllName)
 {
     int         rc;
@@ -164 +164 @@
     MYSQL_RES * pres;
 
-    sprintf(&szQuery[0], "SELECT refcode FROM module WHERE name = '%s'\n", pszModName);
+    sprintf(&szQuery[0], "SELECT refcode FROM dll WHERE name = '%s'\n", pszDllName);
     rc   = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
@@ -178 +178 @@
 
 /**
- * Count the function in a given module.
- * @returns Number of functions. -1 on error.
- * @param   lModule         Module refcode.
- * @param   fNotAliases     TRUE: don't count aliased functions.
- */
-signed long     _System dbCountFunctionInModule(signed long lModule, BOOL fNotAliases)
+ * Count the function in a given dll.
+ * @returns  Number of functions. -1 on error.
+ * @param    lDll         Dll refcode.
+ * @param    fNotAliases  TRUE: don't count aliased functions.
+ */
+signed long     _System dbCountFunctionInDll(signed long lDll, BOOL fNotAliases)
 {
     signed long rc;
@@ -189 +189 @@
     MYSQL_RES * pres;
 
-    if (lModule >= 0)
-    {
-        sprintf(&szQuery[0], "SELECT count(refcode) FROM function WHERE module = %ld\n", lModule);
+    if (lDll >= 0)
+    {
+        sprintf(&szQuery[0], "SELECT count(refcode) FROM function WHERE dll = %ld\n", lDll);
         if (fNotAliases)
             strcat(&szQuery[0], " AND aliasfn < 0");
@@ -211 +211 @@
 
 /**
- * Checks if module exists. If not exists the module is inserted.
- * @returns Module refcode. -1 on errors.
- * @param   pszModule   Module name.
- * @param   fchType     Module type.
- * @remark  This search must be case insensitive.
- *          (In the mysql-world everything is case insensitive!)
- */
-signed long _System dbCheckInsertModule(const char *pszModule, char fchType)
+ * Checks if dll exists. If not exists the dll is inserted.
+ * @returns   Dll refcode. -1 on errors.
+ * @param     pszDll  Dll name.
+ * @remark    This search must be case insensitive.
+ *            (In the mysql-world everything is case insensitive!)
+ */
+signed long _System dbCheckInsertDll(const char *pszDll, char fchType)
 {
     int         rc;
@@ -225 +224 @@
 
     /* try find match */
-    sprintf(&szQuery[0], "SELECT refcode, name FROM module WHERE name = '%s'\n", pszModule);
+    sprintf(&szQuery[0], "SELECT refcode, name FROM dll WHERE name = '%s'\n", pszDll);
     rc   = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
 
-    /* not found? - insert module */
+    /* not found? - insert dll */
     if (rc < 0 || pres == NULL || mysql_num_rows(pres) == 0)
     {
         mysql_free_result(pres);
 
-        sprintf(&szQuery[0], "INSERT INTO module(name, type) VALUES('%s', '%c')\n", pszModule, fchType);
+        sprintf(&szQuery[0], "INSERT INTO dll(name, type) VALUES('%s', '%c')\n", pszDll, fchType);
         rc = mysql_query(pmysql, &szQuery[0]);
         if (rc < 0)
@@ -240 +239 @@
 
         /* select row to get refcode */
-        sprintf(&szQuery[0], "SELECT refcode, name FROM module WHERE name = '%s'\n", pszModule);
+        sprintf(&szQuery[0], "SELECT refcode, name FROM dll WHERE name = '%s'\n", pszDll);
         rc   = mysql_query(pmysql, &szQuery[0]);
         pres = mysql_store_result(pmysql);
@@ -291 +290 @@
  * The update flags is always updated.
  * @returns     Success indicator. TRUE / FALSE.
- * @param       lModule             Module refcode.
+ * @param       lDll                Dll refcode.
  * @param       pszFunction         Function name.
  * @param       pszIntFunction      Internal function name. (required!)
@@ -298 +297 @@
  * @param       fchType             Function type flag. One of the FUNCTION_* defines.
  */
-BOOL _System dbInsertUpdateFunction(signed long lModule,
+BOOL _System dbInsertUpdateFunction(signed long lDll,
                                     const char *pszFunction, const char *pszIntFunction,
                                     unsigned long ulOrdinal, BOOL fIgnoreOrdinal, char fchType)
@@ -313 +312 @@
 
     /* try find function */
-    sprintf(pszQuery, "SELECT refcode, intname FROM function WHERE module = %d AND name = '%s'", lModule, pszFunction);
+    sprintf(pszQuery, "SELECT refcode, intname FROM function WHERE dll = %d AND name = '%s'", lDll, pszFunction);
     rc = mysql_query(pmysql, pszQuery);
     pres = mysql_store_result(pmysql);
@@ -323 +322 @@
         if (mysql_num_rows(pres) > 1)
         {
-            fprintf(stderr, "internal database integrity error(%s): More function by the same name for the same module. "
-                    "lModule = %d, pszFunction = %s\n", __FUNCTION__, lModule, pszFunction);
+            fprintf(stderr, "internal database integrity error(%s): More function by the same name for the same dll. "
+                    "lDll = %d, pszFunction = %s\n", __FUNCTION__, lDll, pszFunction);
             return FALSE;
         }
@@ -348 +347 @@
          * Insert it.
          */
-        sprintf(&szQuery[0], "INSERT INTO function(module, name, intname, ordinal, updated, type) VALUES(%d, '%s', '%s', %ld, 1, '%c')",
-                lModule, pszFunction, pszIntFunction, ulOrdinal, fchType);
+        sprintf(&szQuery[0], "INSERT INTO function(dll, name, intname, ordinal, updated, type) VALUES(%d, '%s', '%s', %ld, 1, '%c')",
+                lDll, pszFunction, pszIntFunction, ulOrdinal, fchType);
         rc = mysql_query(pmysql, &szQuery[0]);
     }
@@ -361 +360 @@
  * Inserts or updates (existing) file information.
  * @returns     Success indicator (TRUE / FALSE).
- * @param       lModule         Module reference code.
+ * @param       lDll           Dll reference code.
  * @param       pszFilename     Filename.
  * @param       pszDescription  Pointer to file description.
@@ -370 +369 @@
  * @remark
  */
-BOOL            _System dbInsertUpdateFile(signed long lModule,
+BOOL            _System dbInsertUpdateFile(signed long lDll,
                                            const char *pszFilename,
                                            const char *pszDescription,
@@ -383 +382 @@
 
     /* parameter assertions */
-    assert(lModule != 0);
+    assert(lDll != 0);
     assert(pszFilename != NULL);
     assert(*pszFilename != '\0');
 
     /* try find file */
-    sprintf(&szQuery[0], "SELECT refcode, name FROM file WHERE module = %d AND name = '%s'", lModule, pszFilename);
+    sprintf(&szQuery[0], "SELECT refcode, name FROM file WHERE dll = %d AND name = '%s'", lDll, pszFilename);
     rc = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
@@ -396 +395 @@
         if (mysql_num_rows(pres) > 1)
         {
-            fprintf(stderr, "internal database integrity error(%s): More files by the same name in the same module. "
-                    "lModule = %d, pszFilename = %s\n", __FUNCTION__, lModule, pszFilename);
+            fprintf(stderr, "internal database integrity error(%s): More files by the same name in the same dll. "
+                    "lDll = %d, pszFilename = %s\n", __FUNCTION__, lDll, pszFilename);
             return FALSE;
         }
@@ -451 +450 @@
     else
     {   /* insert */
-        sprintf(&szQuery[0], "INSERT INTO file(module, name, lastauthor, description, lastdatetime, revision) VALUES(%d, '%s', %ld, ",
-                lModule, pszFilename, lLastAuthor);
+        sprintf(&szQuery[0], "INSERT INTO file(dll, name, lastauthor, description, lastdatetime, revision) VALUES(%d, '%s', %ld, ",
+                lDll, pszFilename, lLastAuthor);
         if (pszDescription != NULL && *pszDescription != '\0')
             sqlstrcat(&szQuery[0], NULL, pszDescription);
@@ -525 +524 @@
  * @param     pszFunctionName   Pointer to a function name string. (input)
  * @param     pFnFindBuf        Pointer to a find buffer. (output)
- * @param     lModule           Module refcode (optional). If given the search is limited to
- *                              the given module and aliasing functions is updated (slow!).
- * @sketch    1) Get functions for this module(if given).
+ * @param     lDll              Dll refcode (optional). If given the search is limited to
+ *                              the given dll and aliasing functions is updated (slow!).
+ * @sketch    1) Get functions for this dll(if given).
  *            2) Get functions which aliases the functions found in (1).
  *            3) Get new aliases by intname
@@ -534 +533 @@
  *            6) Update all functions from (3) and (4) to alias the first function from 1.
  */
-BOOL _System dbFindFunction(const char *pszFunctionName, PFNFINDBUF pFnFindBuf, signed long lModule)
+BOOL _System dbFindFunction(const char *pszFunctionName, PFNFINDBUF pFnFindBuf, signed long lDll)
 {
     MYSQL_RES   *pres;
@@ -542 +541 @@
 
     /*
-     * 1) Get functions for this module(if given).
+     * 1) Get functions for this dll(if given).
      */
-    if (lModule < 0)
-        sprintf(&szQuery[0], "SELECT refcode, module, aliasfn, file, name, type FROM function WHERE intname = '%s'",
+    if (lDll < 0)
+        sprintf(&szQuery[0], "SELECT refcode, dll, aliasfn, file, name FROM function WHERE intname = '%s'",
                 pszFunctionName);
     else
-        sprintf(&szQuery[0], "SELECT refcode, module, aliasfn, file, name, type FROM function "
-                "WHERE intname = '%s' AND module = %ld",
-                pszFunctionName, lModule);
+        sprintf(&szQuery[0], "SELECT refcode, dll, aliasfn, file, name FROM function "
+                "WHERE intname = '%s' AND dll = %ld",
+                pszFunctionName, lDll);
 
     rc = mysql_query1(pmysql, &szQuery[0]);
@@ -559 +558 @@
         {
             char szFnName[NBR_FUNCTIONS][80];
-            BOOL fAPI = FALSE;
 
             pFnFindBuf->cFns = 0;
@@ -565 +563 @@
             {
                 pFnFindBuf->alRefCode[pFnFindBuf->cFns] = atol(row[0]);
-                pFnFindBuf->alModRefCode[pFnFindBuf->cFns] = atol(row[1]);
+                pFnFindBuf->alDllRefCode[pFnFindBuf->cFns] = atol(row[1]);
                 pFnFindBuf->alAliasFn[pFnFindBuf->cFns] = atol(row[2]);
                 pFnFindBuf->alFileRefCode[pFnFindBuf->cFns] = atol(row[3]);
                 strcpy(szFnName[pFnFindBuf->cFns], row[4]);
-                pFnFindBuf->achType[pFnFindBuf->cFns] = *row[5];
-                if (pFnFindBuf->achType[pFnFindBuf->cFns] == FUNCTION_ODIN32_API ||
-                    pFnFindBuf->achType[pFnFindBuf->cFns] == FUNCTION_INTERNAL_ODIN32_API)
-                    fAPI = TRUE;
 
                 /* next */
@@ -579 +573 @@
             mysql_free_result(pres);
 
-            /* alias check and fix for apis. */
-            if (fAPI && lModule >= 0 && pFnFindBuf->cFns != 0)
+            /* alias check and fix */
+            if (lDll >= 0 && pFnFindBuf->cFns != 0)
             {
-                int cFnsThisModule, cFnsAliasesAndThisModule, i, f;
+                int cFnsThisDll, cFnsAliasesAndThisDll, i, f;
 
                 /*
                  * 2) Get functions which aliases the functions found in (1).
                  */
-                cFnsThisModule = (int)pFnFindBuf->cFns;
-                strcpy(&szQuery[0], "SELECT refcode, module, aliasfn, file, name FROM function WHERE aliasfn IN (");
-                for (i = 0; i < cFnsThisModule; i++)
+                cFnsThisDll = (int)pFnFindBuf->cFns;
+                strcpy(&szQuery[0], "SELECT refcode, dll, aliasfn, file, name FROM function WHERE aliasfn IN (");
+                for (i = 0; i < cFnsThisDll; i++)
                 {
                     if (i > 0)  strcat(&szQuery[0], " OR ");
@@ -605 +599 @@
                         {
                             pFnFindBuf->alRefCode[pFnFindBuf->cFns] = atol(row[0]);
-                            pFnFindBuf->alModRefCode[pFnFindBuf->cFns] = atol(row[1]);
+                            pFnFindBuf->alDllRefCode[pFnFindBuf->cFns] = atol(row[1]);
                             pFnFindBuf->alAliasFn[pFnFindBuf->cFns] = atol(row[2]);
                             pFnFindBuf->alFileRefCode[pFnFindBuf->cFns] = atol(row[3]);
@@ -618 +612 @@
                          * 3) Get new aliases by intname
                          */
-                        cFnsAliasesAndThisModule = (int)pFnFindBuf->cFns;
-                        sprintf(&szQuery[0], "SELECT refcode, module, aliasfn, file FROM function "
-                                             "WHERE aliasfn = (-1) AND module <> %ld AND (intname = '%s'",
-                                lModule, pszFunctionName);
-                        for (i = 0; i < cFnsAliasesAndThisModule; i++)
+                        cFnsAliasesAndThisDll = (int)pFnFindBuf->cFns;
+                        sprintf(&szQuery[0], "SELECT refcode, dll, aliasfn, file FROM function "
+                                             "WHERE aliasfn = (-1) AND dll <> %ld AND (intname = '%s'",
+                                lDll, pszFunctionName);
+                        for (i = 0; i < cFnsAliasesAndThisDll; i++)
                             sprintf(&szQuery[strlen(&szQuery[0])], " OR intname = '%s'", szFnName[i]);
                         strcat(&szQuery[0], ")");
@@ -635 +629 @@
                                 {
                                     pFnFindBuf->alRefCode[pFnFindBuf->cFns] = atol(row[0]);
-                                    pFnFindBuf->alModRefCode[pFnFindBuf->cFns] = atol(row[1]);
+                                    pFnFindBuf->alDllRefCode[pFnFindBuf->cFns] = atol(row[1]);
                                     if (row[2] != NULL)
                                         pFnFindBuf->alAliasFn[pFnFindBuf->cFns] = atol(row[2]);
@@ -651 +645 @@
                                  * 4) Get new aliases by name
                                  */
-                                sprintf(&szQuery[0], "SELECT refcode, module, aliasfn, file FROM function "
-                                                     "WHERE aliasfn = (-1) AND module <> %ld AND (name = '%s'",
-                                        lModule, pszFunctionName);
-                                for (i = 0; i < cFnsAliasesAndThisModule; i++)
+                                sprintf(&szQuery[0], "SELECT refcode, dll, aliasfn, file FROM function "
+                                                     "WHERE aliasfn = (-1) AND dll <> %ld AND (name = '%s'",
+                                        lDll, pszFunctionName);
+                                for (i = 0; i < cFnsAliasesAndThisDll; i++)
                                     sprintf(&szQuery[strlen(&szQuery[0])], " OR name = '%s'", szFnName[i]);
                                 strcat(&szQuery[0], ")");
@@ -667 +661 @@
                                         {
                                             pFnFindBuf->alRefCode[pFnFindBuf->cFns] = atol(row[0]);
-                                            pFnFindBuf->alModRefCode[pFnFindBuf->cFns] = atol(row[1]);
+                                            pFnFindBuf->alDllRefCode[pFnFindBuf->cFns] = atol(row[1]);
                                             if (row[2] != NULL)
                                                 pFnFindBuf->alAliasFn[pFnFindBuf->cFns] = atol(row[2]);
@@ -684 +678 @@
                                         sprintf(&szQuery[0], "UPDATE function SET aliasfn = (-2) "
                                                              "WHERE refcode IN (",
-                                                lModule, pszFunctionName);
-                                        for (f = 0, i = 0; i < cFnsThisModule; i++)
+                                                lDll, pszFunctionName);
+                                        for (f = 0, i = 0; i < cFnsThisDll; i++)
                                             if (pFnFindBuf->alAliasFn[i] != ALIAS_DONTMIND)
                                                 sprintf(&szQuery[strlen(&szQuery[0])],
@@ -694 +688 @@
                                         else
                                             rc = 0;
-                                        if (rc >= 0 && cFnsAliasesAndThisModule < pFnFindBuf->cFns)
+                                        if (rc >= 0 && cFnsAliasesAndThisDll < pFnFindBuf->cFns)
                                         {
                                             /*
@@ -702 +696 @@
                                                                  "WHERE aliasfn = (-1) AND refcode IN (",
                                                     pFnFindBuf->alRefCode[0], pFnFindBuf->alFileRefCode[0]);
-                                            for (i = cFnsAliasesAndThisModule; i < pFnFindBuf->cFns; i++)
+                                            for (i = cFnsAliasesAndThisDll; i < pFnFindBuf->cFns; i++)
                                             {
                                                 sprintf(&szQuery[strlen(&szQuery[0])],
-                                                        i > cFnsAliasesAndThisModule ? ", %ld" : "%ld", pFnFindBuf->alRefCode[i]);
+                                                        i > cFnsAliasesAndThisDll ? ", %ld" : "%ld", pFnFindBuf->alRefCode[i]);
                                             }
                                             strcat(&szQuery[0], ")");
@@ -728 +722 @@
 /**
  * Finds the refcode for a file (if it exists).
- * @returns File 'refcode'.
- *          -1 on error or not found.
- * @param   lModule         Refcode of the module which this file belongs to.
- * @param   pszFilename     The filename to search for.
- */
-signed long     _System dbFindFile(signed long lModule, const char *pszFilename)
+ * @returns     File 'refcode'.
+ *              -1 on error or not found.
+ * @param       lDll            Refcode of the dll which this file belongs to.
+ * @param       pszFilename     The filename to search for.
+ */
+signed long     _System dbFindFile(signed long lDll, const char *pszFilename)
 {
     char        szQuery[256];
@@ -739 +733 @@
     signed long lRefCode = -1;
 
-    assert(lModule >= 0);
+    assert(lDll >= 0);
     assert(pszFilename != NULL);
     assert(*pszFilename != '\0');
 
-    sprintf(&szQuery[0], "SELECT refcode FROM file WHERE module = %ld AND name = '%s'",
-            lModule, pszFilename);
+    sprintf(&szQuery[0], "SELECT refcode FROM file WHERE dll = %ld AND name = '%s'",
+            lDll, pszFilename);
     if (mysql_query(pmysql, &szQuery[0]) >= 0)
     {
@@ -884 +878 @@
  * @returns   number of errors.
  * @param     pFnDesc   Function description struct.
- * @param     lModule   Module which we are working at.
+ * @param     lDll      Dll which we are working at.
  * @param     pszError  Buffer for error messages
  * @result    on error(s) pszError will hold information about the error(s).
  */
-unsigned long _System dbUpdateFunction(PFNDESC pFnDesc, signed long lModule, char *pszError)
+unsigned long _System dbUpdateFunction(PFNDESC pFnDesc, signed long lDll, char *pszError)
 {
     MYSQL_RES *     pres;
@@ -1146 +1140 @@
     } /* for */
 
-    lModule = lModule;
+    lDll = lDll;
     free(pszQuery2);
     return ulRc;
@@ -1154 +1148 @@
 /**
  * Removes all the existing design notes in the specified file.
- * @returns Success indicator.
- * @param   lFile       File refcode of the file to remove all design notes for.
- * @author  knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @returns     Success indicator.
+ * @param       lFile       File refcode of the file to remove all design notes for.
+ * @sketch
+ * @status
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @remark
  */
 BOOL            _System dbRemoveDesignNotes(signed long lFile)
@@ -1171 +1168 @@
  * Adds a design note.
  * @returns     Success indicator.
- * @param       lModule         Module refcode.
+ * @param       lDll            Dll refcode.
  * @param       lFile           File refcode.
  * @param       pszTitle        Design note title.
  * @param       pszText         Design note text.
  * @param       lLevel          Level of the note section. 0 is the design note it self.
- * @param       lSeqNbr         Sequence number (in module). If 0 the use next available number.
+ * @param       lSeqNbr         Sequence number (in dll). If 0 the use next available number.
  * @param       lSeqNbrNote     Sequence number in note.
  * @param       lLine           Line number (1 - based!).
@@ -1184 +1181 @@
  * @param       plRefCode       Pointer to reference id of the design note. see fSubSection for more info.
  */
-BOOL            _System dbAddDesignNote(signed long lModule,
+BOOL            _System dbAddDesignNote(signed long lDll,
                                         signed long lFile,
                                         const char *pszTitle,
@@ -1200 +1197 @@
 
 
-    assert(lModule >= 0 && lFile >= 0);
+    assert(lDll >= 0 && lFile >= 0);
     assert(lSeqNbrNote >= 0);
 
@@ -1208 +1205 @@
     if (lSeqNbr == 0 && !fSubSection)
     {
-        sprintf(&szQuery[0], "SELECT MAX(seqnbr) + 1 FROM designnote WHERE module = %ld AND level = 0", lModule);
+        sprintf(&szQuery[0], "SELECT MAX(seqnbr) + 1 FROM designnote WHERE dll = %ld AND level = 0", lDll);
         if (mysql_query(pmysql, &szQuery[0]) >= 0)
         {
@@ -1232 +1229 @@
      */
     if (!fSubSection)
-        sprintf(&szQuery[0], "INSERT INTO designnote(module, file, level, seqnbrnote, seqnbr, line, name, note) "
+        sprintf(&szQuery[0], "INSERT INTO designnote(dll, file, level, seqnbrnote, seqnbr, line, name, note) "
                              "VALUES (%ld, %ld, %ld, %ld, %ld, %ld, ",
-                lModule, lFile, lLevel, lSeqNbrNote, lSeqNbr, lLine);
+                lDll, lFile, lLevel, lSeqNbrNote, lSeqNbr, lLine);
     else
-        sprintf(&szQuery[0], "INSERT INTO designnote(refcode, module, file, level, seqnbrnote, seqnbr, line, name, note) "
+        sprintf(&szQuery[0], "INSERT INTO designnote(refcode, dll, file, level, seqnbrnote, seqnbr, line, name, note) "
                              "VALUES (%ld, %ld, %ld, %ld, %ld, %ld, %ld, ",
-                *plRefCode, lModule, lFile, lLevel, lSeqNbrNote, lSeqNbr, lLine);
+                *plRefCode, lDll, lFile, lLevel, lSeqNbrNote, lSeqNbr, lLine);
 
     if (pszTitle != NULL && *pszTitle != '\0')
@@ -1289 +1286 @@
 
             /* delete - all rows on this date in the history tables */
-            sprintf(pszQuery, "DELETE FROM historymodule WHERE date = '%s'", &szCurDt[0]);
+            sprintf(pszQuery, "DELETE FROM historydll WHERE date = '%s'", &szCurDt[0]);
             rc = mysql_query(pmysql, pszQuery);
             CheckLogContinue((pszError, "error removing old history rows: %s - (sql=%s) ", dbGetLastErrorDesc(), pszQuery));
@@ -1297 +1294 @@
             CheckLogContinue((pszError, "error removing old history rows: %s - (sql=%s) ", dbGetLastErrorDesc(), pszQuery));
 
-            sprintf(pszQuery, "DELETE FROM historymoduletotal WHERE date = '%s'", &szCurDt[0]);
+            sprintf(pszQuery, "DELETE FROM historydlltotal WHERE date = '%s'", &szCurDt[0]);
             rc = mysql_query(pmysql, pszQuery);
             CheckLogContinue((pszError, "error removing old history rows: %s - (sql=%s) ", dbGetLastErrorDesc(), pszQuery));
@@ -1305 +1302 @@
 
             /* insert new stats */
-            sprintf(pszQuery, "INSERT INTO historymodule(module, state, date, count, type) "
-                    "SELECT module, state, '%s', count(*), type FROM function GROUP BY module, state, type",
+            sprintf(pszQuery, "INSERT INTO historydll(dll, state, date, count) "
+                    "SELECT dll, state, '%s', count(*) FROM function GROUP BY dll, state",
                     &szCurDt[0]);
             rc = mysql_query(pmysql, pszQuery);
@@ -1319 +1316 @@
 
             /* inserting new totals */
-            sprintf(pszQuery, "INSERT INTO historymoduletotal(module, date, totalcount, type) "
-                    "SELECT module, '%s', count(*), type FROM function GROUP BY module, type",
+            sprintf(pszQuery, "INSERT INTO historydlltotal(dll, date, totalcount) "
+                    "SELECT dll, '%s', count(*) FROM function GROUP BY dll",
                     &szCurDt[0]);
             rc = mysql_query(pmysql, pszQuery);
@@ -1326 +1323 @@
 
             sprintf(pszQuery, "INSERT INTO historyapigrouptotal(apigroup, date, totalcount) "
-                    "SELECT apigroup, '%s', count(*) FROM function WHERE apigroup IS NOT NULL AND type = 'A' "
+                    "SELECT apigroup, '%s', count(*) FROM function WHERE apigroup IS NOT NULL "
                     "GROUP BY apigroup",
                     &szCurDt[0]);
@@ -1372 +1369 @@
 
     /* foreign keys in function table */
-    strcpy(pszQuery, "SELECT refcode, module, state, apigroup, file FROM function");
+    strcpy(pszQuery, "SELECT refcode, dll, state, apigroup, file FROM function");
     rc = mysql_query(pmysql, pszQuery);
     if (rc >= 0)
@@ -1381 +1378 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
-                sprintf(pszQuery, "SELECT refcode FROM module WHERE refcode = %s", row1[1]);
+                /* check dll */
+                sprintf(pszQuery, "SELECT refcode FROM dll WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("function/module", "Foreign key 'module' not found in the module table");
+                CheckFKError("function/dll", "Foreign key 'dll' not found in the dll table");
 
                 /* check state */
@@ -1414 +1411 @@
 
     /* foreign keys in file */
-    strcpy(pszQuery, "SELECT refcode, module FROM file");
+    strcpy(pszQuery, "SELECT refcode, dll FROM file");
     rc = mysql_query(pmysql, pszQuery);
     if (rc >= 0)
@@ -1423 +1420 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
-                sprintf(pszQuery, "SELECT refcode FROM module WHERE refcode = %s", row1[1]);
+                /* check dll */
+                sprintf(pszQuery, "SELECT refcode FROM dll WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("apigroup/module", "Foreign key 'module' not found in the module table");
+                CheckFKError("apigroup/dll", "Foreign key 'dll' not found in the dll table");
             }
             mysql_free_result(pres1);
@@ -1435 +1432 @@
 
     /* foreign keys in apigroup */
-    strcpy(pszQuery, "SELECT refcode, module FROM apigroup");
+    strcpy(pszQuery, "SELECT refcode, dll FROM apigroup");
     rc = mysql_query(pmysql, pszQuery);
     if (rc >= 0)
@@ -1444 +1441 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
-                sprintf(pszQuery, "SELECT refcode FROM module WHERE refcode = %s", row1[1]);
+                /* check dll */
+                sprintf(pszQuery, "SELECT refcode FROM dll WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("file/module", "Foreign key 'module' not found in the module table");
+                CheckFKError("file/dll", "Foreign key 'dll' not found in the dll table");
             }
             mysql_free_result(pres1);
@@ -1481 +1478 @@
         ulRc += logDbError(pszError, pszQuery);
 
-    /* foreign keys in historymodule table */
-    strcpy(pszQuery, "SELECT date, module, state FROM historymodule");
+    /* foreign keys in historydll table */
+    strcpy(pszQuery, "SELECT date, dll, state FROM historydll");
     rc = mysql_query(pmysql, pszQuery);
     if (rc >= 0)
@@ -1491 +1488 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
-                sprintf(pszQuery, "SELECT refcode FROM module WHERE refcode = %s", row1[1]);
+                /* check dll */
+                sprintf(pszQuery, "SELECT refcode FROM dll WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("historymodule/module", "Foreign key 'module' not found in the module table");
+                CheckFKError("historydll/dll", "Foreign key 'dll' not found in the dll table");
 
                 /* check state */
                 sprintf(pszQuery, "SELECT refcode FROM state WHERE refcode = %s", row1[2]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("historymodule/state", "Foreign key 'state' not found in the state table");
+                CheckFKError("historydll/state", "Foreign key 'state' not found in the state table");
             }
             mysql_free_result(pres1);
@@ -1517 +1514 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
+                /* check dll */
                 sprintf(pszQuery, "SELECT refcode FROM apigroup WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
@@ -1533 +1530 @@
         ulRc += logDbError(pszError, pszQuery);
 
-    /* foreign keys in historymoduletotal table */
-    strcpy(pszQuery, "SELECT date, module FROM historymoduletotal");
+    /* foreign keys in historydlltotal table */
+    strcpy(pszQuery, "SELECT date, dll FROM historydlltotal");
     rc = mysql_query(pmysql, pszQuery);
     if (rc >= 0)
@@ -1543 +1540 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
-                sprintf(pszQuery, "SELECT refcode FROM module WHERE refcode = %s", row1[1]);
+                /* check dll */
+                sprintf(pszQuery, "SELECT refcode FROM dll WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
-                CheckFKError("historymoduletotal/module", "Foreign key 'module' not found in the module table");
+                CheckFKError("historydlltotal/dll", "Foreign key 'dll' not found in the dll table");
             }
             mysql_free_result(pres1);
@@ -1564 +1561 @@
             while ((row1 = mysql_fetch_row(pres1)) != NULL)
             {
-                /* check module */
+                /* check dll */
                 sprintf(pszQuery, "SELECT refcode FROM apigroup WHERE refcode = %s", row1[1]);
                 rc = mysql_query(pmysql, pszQuery);
@@ -1858 +1855 @@
 
 /**
- * Display all functions for, the given module, that is not updated.
+ * Display all functions for, the given dll, that is not updated.
  * @returns   TRUE / FALSE.
- * @param     lModule      Module reference number.
+ * @param     lDll         Dll reference number.
  * @param     dbFetchCall  Callback function which will be called once for each
  *                         field for all the functions not updated.
  *                         pvUser is NULL, pszValue field value, pszFieldName the field name.
  */
-BOOL _System dbGetNotUpdatedFunction(signed long lModule, DBCALLBACKFETCH dbFetchCallBack)
+BOOL _System dbGetNotUpdatedFunction(signed long lDll, DBCALLBACKFETCH dbFetchCallBack)
 {
     BOOL        fRet = FALSE;
@@ -1874 +1871 @@
     sprintf(&szQuery[0], "SELECT f1.name, f1.intname, f1.updated, f1.aliasfn, d.name, f2.name, f2.intname AS last "
                          "FROM function f1 LEFT OUTER JOIN function f2 ON f1.aliasfn = f2.refcode "
-                         "     LEFT JOIN module d ON f2.module = d.refcode "
-                         "WHERE f1.module = %ld AND f1.updated = 0",
-            lModule);
+                         "     LEFT JOIN dll d ON f2.dll = d.refcode "
+                         "WHERE f1.dll = %ld AND f1.updated = 0",
+            lDll);
     pres = dbExecuteQuery(szQuery);
     if (pres != NULL)
@@ -1892 +1889 @@
     sprintf(&szQuery[0], "SELECT f1.name, f1.intname, f1.updated, f1.aliasfn, d.name, f2.name, f2.intname AS last "
                          "FROM function f1 LEFT OUTER JOIN function f2 ON f1.aliasfn = f2.refcode "
-                         "     LEFT JOIN module d ON f2.module = d.refcode "
-                         "WHERE f1.module = %ld AND f1.updated > 1",
-            lModule);
+                         "     LEFT JOIN dll d ON f2.dll = d.refcode "
+                         "WHERE f1.dll = %ld AND f1.updated > 1",
+            lDll);
     pres = dbExecuteQuery(szQuery);
     if (pres != NULL)
@@ -1915 +1912 @@
 
 /**
- * Counts the function for the given MODULE which has been updated.
- * @returns -1 on error, number of updated function on success.
- * @param   lModule     Module reference number.
- */
-signed long _System dbGetNumberOfUpdatedFunction(signed long lModule)
+ * Counts the function for the given DLL which has been updated.
+ * @returns   -1 on error, number of updated function on success.
+ * @param     lDll         Dll reference number.
+ */
+signed long _System dbGetNumberOfUpdatedFunction(signed long lDll)
 {
     int         rc;
@@ -1925 +1922 @@
     MYSQL_RES * pres;
 
-    sprintf(&szQuery[0], "SELECT count(*) FROM function WHERE module = (%ld) AND updated > 0\n", lModule);
+    sprintf(&szQuery[0], "SELECT count(*) FROM function WHERE dll = (%ld) AND updated > 0\n", lDll);
     rc   = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
@@ -1939 +1936 @@
 
 /**
- * Clear the update flags for all file in a module/module.
- * @returns Success indicator. (TRUE / FALSE)
- * @param   lModule     Module refcode.
- * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- * @remark  Intended for use by APIImport.
- */
-BOOL             _System dbClearUpdateFlagFile(signed long lModule)
+ * Clear the update flags for all file in a dll/module.
+ * @returns     Success indicator. (TRUE / FALSE)
+ * @param       lDll    Dll refcode.
+ * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * @remark      Intended for use by APIImport.
+ */
+BOOL             _System dbClearUpdateFlagFile(signed long lDll)
 {
     int         rc;
@@ -1951 +1948 @@
 
     sprintf(&szQuery[0],
-            "UPDATE file SET updated = 0 WHERE module = (%ld)",
-            lModule);
+            "UPDATE file SET updated = 0 WHERE dll = (%ld)",
+            lDll);
     rc = mysql_query(pmysql, &szQuery[0]);
     return rc == 0;
@@ -1960 +1957 @@
 /**
  * Clear update flag
- * @returns Success indicator.
- * @param   lModule Module refcode.
- * @param   fAll    All module. If false only APIs and Internal APIs are cleared
- * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- * @remark  Intended for use by APIImport.
- */
-BOOL             _System dbClearUpdateFlagFunction(signed long lModule, BOOL fAll)
+ * @returns     Success indicator.
+ * @param       lDll    Dll refcode.
+ * @param       fAll    All dll. If false only APIs and Internal APIs are cleared
+ * @author      knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * @remark      Intended for use by APIImport.
+ */
+BOOL             _System dbClearUpdateFlagFunction(signed long lDll, BOOL fAll)
 {
     int         rc;
@@ -1972 +1969 @@
 
     sprintf(&szQuery[0],
-            "UPDATE function SET updated = 0 WHERE module = (%ld)",
-            lModule);
+            "UPDATE function SET updated = 0 WHERE dll = (%ld)",
+            lDll);
     if (!fAll)
         strcat(&szQuery[0], " AND type IN ('A', 'I')");
@@ -1983 +1980 @@
 
 /**
- * Deletes all the files in a module/module which was not found/updated.
+ * Deletes all the files in a dll/module which was not found/updated.
  * @returns     Success indicator.
- * @param       lModule    Module refcode.
+ * @param       lDll    Dll refcode.
  * @sketch      Select all files which is to be deleted.
  *                  Set all references to each file in function to -1.
@@ -1992 +1989 @@
  * @remark      Use with GRATE CARE!
  */
-BOOL             _System dbDeleteNotUpdatedFiles(signed long lModule)
+BOOL             _System dbDeleteNotUpdatedFiles(signed long lDll)
 {
     MYSQL_RES * pres;
@@ -2000 +1997 @@
 
     sprintf(&szQuery[0],
-            "SELECT refcode FROM file WHERE module = (%ld) AND updated = 0",
-            lModule);
+            "SELECT refcode FROM file WHERE dll = (%ld) AND updated = 0",
+            lDll);
     rc = mysql_query(pmysql, &szQuery[0]);
     pres = mysql_store_result(pmysql);
@@ -2018 +2015 @@
 
     sprintf(&szQuery[0],
-            "DELETE FROM file WHERE module = %ld AND updated = 0",
-            lModule);
+            "DELETE FROM file WHERE dll = %ld AND updated = 0",
+            lDll);
     rc = mysql_query(pmysql, &szQuery[0]);
     if (rc) fRc = FALSE;
@@ -2033 +2030 @@
  *
  * @returns     Success indicator. (TRUE / FALSE)
- * @param       lModule     The refcode of the module owning the functions.
- * @param       fAll        All function. If FALSE then only APIs and Internal APIs.
- * @sketch      Select all functions which wan't updated (ie. updated = 0 and module = lModule).
+ * @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 wan't updated (ie. updated = 0 and dll = lDll).
  *              If anyone Then
  *                  Delete the referenced to the functions in:
@@ -2044 +2041 @@
  * @remark      Use with GREATE CARE!
  */
-BOOL             _System dbDeleteNotUpdatedFunctions(signed long lModule, BOOL fAll)
+BOOL             _System dbDeleteNotUpdatedFunctions(signed long lDll, BOOL fAll)
 {
     MYSQL_RES * pres;
@@ -2052 +2049 @@
 
     sprintf(&szQuery[0],
-            "SELECT refcode FROM function WHERE module = %ld AND updated = 0",
-            lModule);
+            "SELECT refcode FROM function WHERE dll = %ld AND updated = 0",
+            lDll);
     if (!fAll)
         strcat(&szQuery[0], " AND type IN ('A', 'I')");
@@ -2084 +2081 @@
         {
             sprintf(&szQuery[0],
-                    "DELETE FROM function WHERE module = %ld AND updated = 0",
-                    lModule);
+                    "DELETE FROM function WHERE dll = %ld AND updated = 0",
+                    lDll);
             if (!fAll)
                 strcat(&szQuery[0], " AND type IN ('A', 'I')");