Changeset 2765 for trunk/tools/database

Timestamp:

Feb 12, 2000, 6:55:04 PM (26 years ago)

Author:

bird

Message:

Some new reports.
General bugfixes and new features.

Location:

trunk/tools/database

Files:

• . (modified) (1 prop)
• .cvsignore (added)
• Aliases.kSqlHtml (added)
• NotFound.kSqlHtml (added)
• StateUpd.cpp (modified) (5 diffs)
• db.cpp (modified) (7 diffs)
• db.h (modified) (2 diffs)
• kHtmlPC.cpp (modified) (2 diffs)
• sample.kSqlHtml (modified) (1 diff)

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.9 2000-02-11 23:54:24 bird Exp $
+/* $Id: StateUpd.cpp,v 1.10 2000-02-12 17:55:02 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -285 +285 @@
 
         /* write status to log */
+        ul2 = dbGetNumberOfUpdatedFunction(options.lDllRefcode);
+        ul1 = dbCountFunctionInDll(options.lDllRefcode);
         fprintf(phLog, "-------------------------------------------------\n");
         fprintf(phLog, "-------- Functions which was not updated --------\n");
@@ -290 +292 @@
         fprintf(phLog, "-------------------------------------------------\n");
         fprintf(phLog, "-------------------------------------------------\n\n");
-        ul1 = dbCountFunctionInDll(options.lDllRefcode);
         fprintf(phLog,"Number of function in this DLL:        %4ld\n", ul1);
-        fprintf(phLog,"Number of successfully processed APIs: %4ld\n", (long)(0x0000FFFF & ulRc));
+        fprintf(phLog,"Number of successfully processed APIs: %4ld (%ld)\n", (long)(0x0000FFFF & ulRc), ul2);
         fprintf(phLog,"Number of signals:                     %4ld\n", (long)(ulRc >> 16));
 
@@ -303 +304 @@
         /* warn if error during processing. */
         fprintf(stdout,"Number of function in this DLL:        %4ld\n", ul1);
-        fprintf(stdout,"Number of successfully processed APIs: %4ld\n", (long)(0x0000FFFF & ulRc));
+        fprintf(stdout,"Number of successfully processed APIs: %4ld (%ld)\n", (long)(0x0000FFFF & ulRc), ul2);
         fprintf(stdout,"Number of signals:                     %4ld\n", (long)(ulRc >> 16));
         if ((int)(ulRc >> 16) > 0)
@@ -1372 +1373 @@
 static long _System dbNotUpdatedCallBack(const char *pszValue, const char *pszFieldName, void *pvUser)
 {
-    if (stricmp(pszFieldName, "name") == 0)
-        fprintf(phLog, "%s ", pszValue);
-    else if (stricmp(pszFieldName, "updated") == 0)
-        fprintf(phLog, "update=%s ", pszValue);
-    else if (stricmp(pszFieldName, "intname") == 0)
-        fprintf(phLog, "(%s)\n", pszValue);
+    static i = 0;
+    switch (i++)
+    {
+        case 0:
+            fprintf(phLog, "%s", pszValue);
+            break;
+        case 1:
+            fprintf(phLog, "(%s)", pszValue);
+            break;
+        case 2: /* updated */
+            fprintf(phLog, " %s=%s", pszFieldName, pszValue);
+            break;
+        case 3: /* aliasfn */
+            fprintf(phLog, " %s=%s", pszFieldName, pszValue);
+            break;
+        case 4:
+            if (pszValue != NULL)
+                fprintf(phLog, " --> %s.", pszValue);
+            break;
+        case 5:
+            if (pszValue != NULL)
+                fprintf(phLog, "%s", pszValue);
+            break;
+        case 6:
+            if (pszValue != NULL)
+                fprintf(phLog, "(%s)", pszValue);
+            break;
+
+        default:
+            i = 0;
+            fprintf(phLog, "\n");
+    }
+
+    if (stricmp(pszFieldName, "last") == 0)
+    {
+        i = 0;
+        fprintf(phLog, "\n");
+    }
 
     pvUser = pvUser;

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.6 2000-02-11 23:54:25 bird Exp $ *
+/* $Id: db.cpp,v 1.7 2000-02-12 17:55:03 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -360 +360 @@
 }
 
-#if 0
+#if 1
 /**
  * Find occurences of a function, given by internal name.
@@ -436 +436 @@
                         {
                             /* get the functions aliases to the functions we have allready found. */
-                            strcpy(&szQuery[0], "SELECT refcode, dll, aliasfn FROM function WHERE (");
+                            strcpy(&szQuery[0], "SELECT refcode, dll, aliasfn FROM function WHERE aliasfn IN (");
                             for (i = 0; i < pFnFindBuf->cFns; i++)
                             {
-                                if (i != 0) strcat(&szQuery[0], "OR ");
-                                sprintf(&szQuery[strlen(szQuery)], "aliasfn = %ld ", pFnFindBuf->alRefCode[i]);
+                                if (i != 0) strcat(&szQuery[0], ", ");
+                                sprintf(&szQuery[strlen(szQuery)], "%ld", pFnFindBuf->alRefCode[i]);
                             }
                             sprintf(&szQuery[strlen(szQuery)], ") AND dll <> %ld", lDll);
@@ -716 +716 @@
     int   i,k,rc;
     unsigned long ulRc = 0;
-    BOOL          f = FALSE;
 
     for (k = 0; k < pFnDesc->cRefCodes; k++)
     {
+        BOOL    f = FALSE;
+
         /* set updated flag */
         sprintf(pszQuery, "UPDATE function SET updated = updated + 1 WHERE refcode = %ld",
@@ -1420 +1421 @@
     BOOL        fRet = FALSE;
     void       *pres;
-    char        szQuery[128];
+    char        szQuery[256];
 
     /* not updated names */
-    sprintf(&szQuery[0], "SELECT name, intname FROM function WHERE dll = %ld AND updated = 0",
+    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 dll d ON f2.dll = d.refcode "
+                         "WHERE f1.dll = %ld AND f1.updated = 0",
             lDll);
     pres = dbExecuteQuery(szQuery);
@@ -1438 +1442 @@
 
     /* warn about updated > 1 too */
-    sprintf(&szQuery[0], "SELECT updated, name, intname FROM function WHERE dll = %ld AND updated > 1",
+    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 dll d ON f2.dll = d.refcode "
+                         "WHERE f1.dll = %ld AND f1.updated > 1",
             lDll);
     pres = dbExecuteQuery(szQuery);
@@ -1456 +1463 @@
 
     return fRet;
+}
+
+
+/**
+ * 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;
+    char        szQuery[128];
+    MYSQL_RES * pres;
+
+    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);
+    if (rc >= 0 && pres != NULL && mysql_num_rows(pres) == 1)
+        rc = (int)getvalue(0, mysql_fetch_row(pres));
+    else
+        rc = -1;
+    mysql_free_result(pres);
+    return (signed long)rc;
 }
 

trunk/tools/database/db.h

@@ -1 @@
-/* $Id: db.h,v 1.4 2000-02-11 23:54:25 bird Exp $ */
+/* $Id: db.h,v 1.5 2000-02-12 17:55:03 bird Exp $ */
 /*
  * DB - contains all database routines
@@ -114 +114 @@
     BOOL            _System dbGetNotUpdatedFunction(signed long lDll,
                                                     DBCALLBACKFETCH dbFetchCallBack);
+    signed long     _System dbGetNumberOfUpdatedFunction(signed long lDll);
 
 #ifdef __cplusplus

trunk/tools/database/kHtmlPC.cpp

@@ -1 @@
-/* $Id: kHtmlPC.cpp,v 1.1 1999-09-05 02:53:06 bird Exp $ */
+/* $Id: kHtmlPC.cpp,v 1.2 2000-02-12 17:55:03 bird Exp $ */
 /*
  * kHtmlPC - Special-purpose HTML/SQL preprocessor.
@@ -1416 +1416 @@
 
     /* copy string */
-    while (*pszFrom != '\"' && *pszFrom != '>' && *pszFrom != '\0')
+    while (*pszFrom != '\"' /*&& *pszFrom != '>'*/ && *pszFrom != '\0')
         *pszTo++ = *pszFrom++;
     *pszTo = '\0';

trunk/tools/database/sample.kSqlHtml

@@ +1 @@
+<!-- $Id: sample.kSqlHtml,v 1.2 2000-02-12 17:55:04 bird Exp $
+  --
+  -- kSqlHTML Template Sample.
+  --
+  -- Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+  --
+  -- Project Odin Software License can be found in LICENSE.TXT
+  -->
+
 <!kTemplate filename="odin32ImplementationStatus.html"><HTML>
 <Title>Odin32 Implementation Status</Title>