Changeset 2818 for trunk/tools/database

Timestamp:

Feb 18, 2000, 1:42:08 PM (26 years ago)

Author:

bird

Message:

Read more of the function header into the database.
Stateupd is changed to do this and the database is expanded with new fields.
The sample is partly updated.

Location:

trunk/tools/database

Files:

• CreateTables.sql (modified) (3 diffs)
• StateUpd.cpp (modified) (21 diffs)
• db.cpp (modified) (14 diffs)
• db.h (modified) (5 diffs)
• kHtmlPC.cpp (modified) (20 diffs)
• kHtmlPC.h (modified) (4 diffs)
• sample.kSqlHtml (modified) (2 diffs)

trunk/tools/database/CreateTables.sql

@@ -1 @@
--- $Id: CreateTables.sql,v 1.6 2000-02-15 13:31:06 bird Exp $
+-- $Id: CreateTables.sql,v 1.7 2000-02-18 12:42:05 bird Exp $
 --
 -- Create all tables.
@@ -37 +37 @@
     return   VARCHAR(64),
     updated  TINYINT  NOT NULL DEFAULT 0,
+    description TEXT,
+    remark      TEXT,
+    returndesc  TEXT,
+    sketch      TEXT,
+    equiv       TEXT,
+    time        TEXT,
     UNIQUE i1(refcode, aliasfn),
     UNIQUE i1a(dll, aliasfn, refcode),
@@ -112 +118 @@
     name     VARCHAR(64) NOT NULL,
     type     VARCHAR(64) NOT NULL,
-    description VARCHAR(128),
-    INDEX  i1(function, name(10)),
+    description TEXT,
+    INDEX  i1(function, name),
     UNIQUE u1(function, name)
 );

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.18 2000-02-15 13:37:52 bird Exp $
+/* $Id: StateUpd.cpp,v 1.19 2000-02-18 12:42:06 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -15 +15 @@
 #define INCL_DOSPROCESS
 #include <os2.h>
+#include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 
@@ -30 +31 @@
 static FILE  *phLog = NULL;
 static FILE  *phSignal = NULL;
+
+static const char *pszCommonKeywords[] =
+{
+    "* Author",     "* Status",     "* Remark",     "* Result",
+    "* Variable",   "* Parameters", "* Purpose",    NULL
+};
 
 
@@ -44 +51 @@
 static unsigned long analyseFnDcl(PFNDESC pFnDesc, char **papszLines, int i, int &iRet, const char *pszFilename, POPTIONS pOptions);
 static unsigned long analyseFnDcl2(PFNDESC pFnDesc, char **papszLines, int i, int &iRet, const char *pszFilename, POPTIONS pOptions);
+static char *SDSCopyTextUntilNextTag(char *pszTarget, BOOL fHTML, int iStart, int iEnd, char **papszLines, const char *pszStart = NULL);
+static char *CommonCopyTextUntilNextTag(char *pszTarget, BOOL fHTML, int iStart, int iEnd, char **papszLines, const char *pszStart = NULL);
 static BOOL  isFunction(char **papszLines, int i, POPTIONS pOptions);
 static long _System dbNotUpdatedCallBack(const char *pszValue, const char *pszFieldName, void *pvUser);
@@ -49 +58 @@
 static char *readFileIntoMemory(const char *pszFilename);
 static char **createLineArray(char *pszFile);
-static char *findEndOfWord(char *psz);
-static char *findStartOfWord(char *psz, const char *pszStart);
-static char *trim(char *psz);
-static void copy(char *psz, int jFrom, int iFrom, int jTo, int iTo, char **papszLines);
-static void copy(char *psz, char *pszFrom, int iFrom, char *pszTo, int iTo, char **papszLines);
+static char *findEndOfWord(const char *psz);
+static char *findStartOfWord(const char *psz, const char *pszStart);
+inline char *trim(char *psz);
+inline char *trimR(char *psz);
+inline char *skip(const char *psz);
+static void  copy(char *psz, int jFrom, int iFrom, int jTo, int iTo, char **papszLines);
+static void  copy(char *psz, char *pszFrom, int iFrom, char *pszTo, int iTo, char **papszLines);
 static char *stristr(const char *pszStr, const char *pszSubStr);
 static char *skipBackwards(const char *pszStopAt, const char *pszFrom, int &iLine, char **papszLines);
+static int   findStrLine(const char *psz, int iStart, int iEnd, char **papszLines);
 
 
@@ -637 +649 @@
         fprintf(phLog, "  cParams: %2d\n", FnDesc.cParams);
         for (j = 0; j < FnDesc.cParams; j++)
-            fprintf(phLog, "  Param %2d: type '%s' %*s name '%s'\n", j, FnDesc.apszParamType[j],
-                    (int)(15 - strlen(FnDesc.apszParamType[j])), "", FnDesc.apszParamName[j]);
+            fprintf(phLog, "  Param %2d: type '%s' %*s name '%s' description: %s\n", j, FnDesc.apszParamType[j],
+                    max((int)(15 - strlen(FnDesc.apszParamType[j])), 0), "", FnDesc.apszParamName[j],
+                    FnDesc.apszParamDesc[j] != NULL ?  FnDesc.apszParamDesc[j] : "(null)");
         fprintf(phLog, "  Status:   %ld - '%s'\n", FnDesc.lStatus, FnDesc.pszStatus != NULL ? FnDesc.pszStatus : "<missing>");
         fprintf(phLog, "  cAuthors: %2d\n", FnDesc.cAuthors);
         for (j = 0; j < FnDesc.cAuthors; j++)
             fprintf(phLog, "  Author %d: '%s'  (refcode=%ld)\n", j, FnDesc.apszAuthor[j], FnDesc.alAuthorRefCode[j]);
+
+        fprintf(phLog, "  Description: %s\n", FnDesc.pszDescription != NULL ? FnDesc.pszDescription : "(null)");
+        fprintf(phLog, "  Remark:      %s\n", FnDesc.pszRemark != NULL ? FnDesc.pszRemark : "(null)");
+        fprintf(phLog, "  Return Desc: %s\n", FnDesc.pszReturnDesc != NULL ? FnDesc.pszReturnDesc : "(null)");
+        fprintf(phLog, "  Sketch:      %s\n", FnDesc.pszSketch != NULL ? FnDesc.pszSketch : "(null)");
+        fprintf(phLog, "  Equiv:       %s\n", FnDesc.pszEquiv != NULL ? FnDesc.pszEquiv : "(null)");
+        fprintf(phLog, "  Time:        %s\n", FnDesc.pszTime != NULL ? FnDesc.pszTime : "(null)");
+        fprintf(phLog, "------------\n");
 
         /* 4.*/
@@ -1068 +1089 @@
  * @param     pszFilename  Filename used in the signal log.
  * @param     pOptions     Pointer to options.
- * @sketch    1. Search backwards (start at i-1) for a comment or code.
+ * @sketch    0. initiate pFnDesc struct
+ *            1. Search backwards (start at i-1) for a comment or code.
  *            2. If comment: (else fail)
  *                2a. find start and end of comment.
@@ -1088 +1110 @@
     int   fSDS = 0;
     char *psz, *pszB;
-    char *pszAuthor = NULL;
+    char *pszAuthors = NULL;
     unsigned long ulRc = 0x00000001;
 
@@ -1096 +1118 @@
         return 0;
 
-    /* 1. + 2a.*/
+    /*
+     * 0. initiate pFnDesc struct
+     */
+    for (j = 0; j < pFnDesc->cParams; j++)
+        pFnDesc->apszParamDesc[j] = NULL;
+    pFnDesc->cAuthors = 0;
+    pFnDesc->pszDescription = pFnDesc->pszRemark = pFnDesc->pszReturnDesc = NULL;
+    pFnDesc->pszSketch = pFnDesc->pszEquiv = pFnDesc->pszTime = pFnDesc->pszStatus = NULL;
+    pFnDesc->lStatus = 99; /* unknown */
+
+    /*
+     * 1. + 2a.
+     */
     iEnd = i-1; /* find end */
     j = strlen(papszLines[iEnd]);
@@ -1134 +1168 @@
     jStart = j;
 
-    /* 2b.*/
+    /*
+     * 2b.
+     */
     if (strncmp(&papszLines[iStart][jStart], "/**", 3) != 0) /* checks that there are more than one star at start of comment */
         return 0;
 
-    iName = iStart; /* Odin32 common */
-    while (iName <= iEnd &&
-           stristr(papszLines[iName], "* Name") == NULL)
-        iName++;
-    iStatus = iStart;
-    while (iStatus <= iEnd &&
-           stristr(papszLines[iStatus], "* Status") == NULL)
-        iStatus++;
-    iAuthor = iStart;
-    while (iAuthor <= iEnd &&
-           stristr(papszLines[iAuthor], "* Author") == NULL)
-        iAuthor++;
-
-    if (!(iName <= iEnd || iStatus <= iEnd || iAuthor <= iEnd)) /* if not found try SDS */
-    {
-        iStatus = iStart;
-        while (iStatus <= iEnd &&
-               stristr(papszLines[iStatus], "@status") == NULL)
-            iStatus++;
-        iAuthor = iStart;
-        while (iAuthor <= iEnd &&
-               stristr(papszLines[iAuthor], "@author") == NULL)
-            iAuthor++;
+    /* Odin32 common? */
+    iName   = findStrLine("* Name", iStart, iEnd, papszLines);
+    iStatus = findStrLine("* Status", iStart, iEnd, papszLines);
+    iAuthor = findStrLine("* Author", iStart, iEnd, papszLines);
+
+    if (!(iName <= iEnd || iStatus <= iEnd || iAuthor <= iEnd))
+    {
+        /* SDS ? */
+        iStatus = findStrLine("@status", iStart, iEnd, papszLines);
+        iAuthor = findStrLine("@author", iStart, iEnd, papszLines);
+        iName   = iEnd + 1;
+
         if (!(iStatus <= iEnd || iAuthor <= iEnd))
             return 0;
-        fSDS = 1;
-    }
-
-    /* 2c.*/
-    if (iName <= iEnd && strstr(papszLines[iName], pFnDesc->pszName) == NULL)
-        fprintf(phLog, "Warning: a matching function name is not found in the name Field\n");
+        fSDS = TRUE;
+    }
+    else
+    {
+        /* 2c.*/
+        if (iName <= iEnd && strstr(papszLines[iName], pFnDesc->pszName) == NULL)
+            fprintf(phLog, "Warning: a matching function name is not found in the name Field\n");
+    }
 
     /* 2d.*/
     pszB = &pFnDesc->szFnHdrBuffer[0];
     if (!fSDS)
-    {   /* Odin32 common */
-        if (iStatus <= iEnd) /* Status */
-        {
-            psz = stristr(papszLines[iStatus], "* Status") + sizeof("* Status") - 1;
-            while (*psz != '\0' && (*psz == ' ' || *psz == ':'))
-                psz++;
-            strcpy(pszB, psz);
-            trim(pszB);
-            if (*pszB != '\0' && pszB[strlen(pszB)-1] == '*') /* just in case some have an right hand '*' column */
-            {
-                pszB[strlen(pszB)-1] = '\0';
-                trim(pszB);
-            }
-            pFnDesc->pszStatus = pszB;
-            pszB += strlen(pszB) + 1;
-        }
-
-        if (iAuthor <= iEnd) /* Author(s) */
-        {
-            pszAuthor = pszB;
-            psz = stristr(papszLines[iAuthor], "* Author") + sizeof("* Author") - 1;
-            do
-            {
-                while (*psz != '\0' && (*psz == ' ' || *psz == ':'))
-                    psz++;
-                strcpy(pszB, psz);
-                trim(pszB);
-                if (*pszB != '\0' && pszB[strlen(pszB)-1] == '*') /* just in case some have an right hand '*' column */
+    {
+        /*
+         * Odin32 common styled header
+         */
+
+        /* Author(s) */
+        pszAuthors              = CommonCopyTextUntilNextTag(pszB, FALSE, iAuthor, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* Status */
+        pFnDesc->pszStatus      = CommonCopyTextUntilNextTag(pszB, FALSE, iStatus, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* Remark */
+        i = findStrLine("* Remark", iStart, iEnd, papszLines);
+        pFnDesc->pszRemark      = CommonCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* Description */
+        i = findStrLine("* Purpose", iStart, iEnd, papszLines);
+        pFnDesc->pszDescription = CommonCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* Return(result) description */
+        i = findStrLine("* Result", iStart, iEnd, papszLines);
+        pFnDesc->pszReturnDesc  = CommonCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* FIXME parameters */
+
+    }
+    else
+    {
+        /*
+         * SDS styled header
+         */
+
+        /* author */
+        pszAuthors              = SDSCopyTextUntilNextTag(pszB, FALSE, iAuthor, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* status */
+        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, FALSE, iStatus, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* remark */
+        i = findStrLine("@remark", iStart, iEnd, papszLines);
+        pFnDesc->pszRemark      = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* description */
+        i = findStrLine("@desc",   iStart, iEnd, papszLines);
+        pFnDesc->pszDescription = SDSCopyTextUntilNextTag(pszB, TRUE, i > iEnd ? iStart : i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* sketch */
+        i = findStrLine("@sketch", iStart, iEnd, papszLines);
+        pFnDesc->pszSketch      = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* return description */
+        i = findStrLine("@return", iStart, iEnd, papszLines);
+        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* time */
+        i = findStrLine("@time", iStart, iEnd, papszLines);
+        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* equiv */
+        i = findStrLine("@equiv", iStart, iEnd, papszLines);
+        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pszB += strlen(pszB) + 1;
+
+        /* Set parameter descriptions to NULL */
+        for (i = 0; i < pFnDesc->cParams; i++)
+            pFnDesc->apszParamDesc[i] = NULL;
+
+        /*
+         * parameters, new @param for each parameter!
+         */
+        do
+        {
+            char *pszParam;
+
+            /* find first */
+            i = findStrLine("@param", iStart, iEnd, papszLines);
+            if (i >= iEnd)
+                break;
+
+            /* Get parameter name - first word */
+            pszParam = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+            if (pszParam != NULL)
+            {
+                /* first word in psz is the parameter name! */
+                psz = findEndOfWord(pszParam);
+                *psz++ = '\0';
+
+                /* find parameter */
+                for (j = 0; j < pFnDesc->cParams; j++)
+                    if (strcmp(pFnDesc->apszParamName[j], pszParam) != 0)
+                        break;
+                if (j < pFnDesc->cParams)
                 {
-                    pszB[strlen(pszB)-1] = '\0';
-                    trim(pszB);
+                    /* find end of parameter name */
+                    psz = findEndOfWord(strstr(papszLines[i], pszParam));
+                    /* copy from end of parameter name */
+                    pFnDesc->apszParamDesc[j] = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines, psz);
+                    pszB += strlen(pszB) + 1;
                 }
-                if (*pszB != '\0' && pszB[strlen(pszB)-1] != ',')
-                    strcat(pszB, ",");
-                pszB += strlen(pszB);
-
-                /* next */
-                psz = papszLines[++iAuthor] + 1;
-                j = 0;
-                while (*psz == ' ' && j++ < 5) psz++;
-                if (*psz == '*')
-                    psz++;
-            } while (iAuthor < iEnd && *psz == ' ');
-            pszB++;
-        }
-    }
-    else
-    {   /* SDS */
-        if (iStatus <= iEnd)
-        {
-            psz = stristr(papszLines[iStatus], "@status") + sizeof("@status");
-            while (*psz == ' ')
-                psz++;
-            strcpy(pszB, psz);
-            trim(pszB);
-            pszB += strlen(pszB) + 1;
-        }
-
-        if (iAuthor <= iEnd)
-        {
-            pszAuthor = pszB;
-            psz = stristr(papszLines[iAuthor], "@author") + sizeof("@author");
-            do
-            {
-                while (*psz == ' ')
-                    psz++;
-                strcpy(pszB, psz);
-                trim(pszB);
-                if (*pszB != '\0' && pszB[strlen(pszB)-1] != ',')
-                    strcat(pszB, ",");
-                pszB += strlen(pszB) + 1;
-
-                /* next */
-                psz = papszLines[++iAuthor] + 1;
-                j = 0;
-                while (*psz == ' ' && j++ < 5) psz++;
-                if (*psz == '*')
-                    psz++;
-            } while (iAuthor <= iEnd && (*psz == ' ' || *psz == '@'));
-            pszB++;
-        }
-    }
-
-    /* Status - refcodes are hardcoded here! */
+                else
+                {   /* signal that parameter name wasn't found! */
+                    fprintf(phSignal, "%s, %s: '%s' is not a valid parameter.\n",
+                            pszFilename, pFnDesc->pszName, pszParam);
+                    ulRc += 0x00010000;
+                }
+            }
+        } while (i > iEnd);
+    }
+
+    /*
+     * Status - refcodes are hardcoded here!
+     */
     if (pFnDesc->pszStatus != NULL && *pFnDesc->pszStatus != '\0')
     {
@@ -1289 +1356 @@
     }
 
-    /* Author */
-    if (pszAuthor)
+    /*
+     * Author
+     */
+    if (pszAuthors != NULL)
     {   /* author1, author2, author3 */
         j = 0;
-        psz = trim(pszAuthor);
+        psz = trim(pszAuthors);
         pFnDesc->cAuthors = 0;
         while (*psz != '\0' && pFnDesc->cAuthors < (int)(sizeof(pFnDesc->apszAuthor) / sizeof(pFnDesc->apszAuthor[0])))
@@ -1299 +1368 @@
             char *pszBr1 = strchr(psz, '[');
             char *pszBr2 = strchr(psz, ']');
-            char *pszComma;
+            char *pszEmail = NULL;
+            char *pszNext;
 
             /* remove '[text]' text - this is usualy used for time/date */
@@ -1307 +1377 @@
 
             /* terminate string */
-            pszComma = strchr(psz, ',');
-            if (pszComma != NULL)
-            {
-                pszAuthor = pszComma + 1;
-                *pszComma = '\0';
+            pszNext = strchr(psz, ',');
+            if (pszNext == NULL)
+                pszNext = strchr(psz, '\n');
+            if (pszNext != NULL)
+                *pszNext = '\0';
+
+            /* check for (email) test */
+            pszBr1 = strchr(psz, '(');
+            pszBr2 = strchr(psz, ')');
+            if (pszBr1 != NULL || pszBr2 != NULL)
+            {
+                if (pszBr1 != NULL)
+                    *pszBr1++ = '\0';
+                if (pszBr2 != NULL)
+                    *pszBr2++ = '\0';
+
+                if (pszBr1 != NULL && pszBr1 < pszBr2)
+                    pszEmail = trim(pszBr1 + 1);
             }
 
             pFnDesc->apszAuthor[pFnDesc->cAuthors]      = trim(psz);
             pFnDesc->alAuthorRefCode[pFnDesc->cAuthors] =
-                dbFindAuthor(pFnDesc->apszAuthor[pFnDesc->cAuthors]);
+                dbFindAuthor(pFnDesc->apszAuthor[pFnDesc->cAuthors], pszEmail);
 
             if (pFnDesc->alAuthorRefCode[pFnDesc->cAuthors] == -1)
@@ -1327 +1410 @@
             /* next */
             pFnDesc->cAuthors++;
-            psz = trim(pszAuthor);
+            psz = pszNext ? skip(pszNext + 1) : "";
         }
     }
@@ -1333 +1416 @@
     return ulRc;
 }
+
+
+
+/**
+ * Copies a piece of tag/keyword text into an buffer. SDS.
+ * @returns   Pointer to buffer. If iStart > iEnd NULL is returned.
+ * @param     pszTarget  Pointer to buffer.
+ * @param     fHTML      Add HTML tags like <br> or not
+ * @param     iStart     Index of start line.
+ * @param     iEnd       Index of last line.
+ * @param     apszLines  Array lines.
+ * @param     pszStart   Pointer to char to start at (into papszLines[iStart] of course!)
+ * @status    completely impelmented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @remark    Addes some HTML tags.
+ */
+static char *SDSCopyTextUntilNextTag(char *pszTarget, BOOL fHTML, int iStart, int iEnd, char **papszLines, const char *pszStart)
+{
+    char *pszRet = pszTarget;
+
+    if (iStart <= iEnd)
+    {
+        int         iStartColumn;
+        const char *psz = pszStart != NULL ? pszStart : papszLines[iStart];
+
+        /*
+         * skip dummy chars.
+         */
+        while (iStart <= iEnd && (*psz == ' ' || *psz == '/' || *psz == '*' || *psz == '\0' ))
+        {
+            if (*psz == '\0')
+                psz = papszLines[++iStart];
+            else
+                psz++;
+        }
+
+        /* Anything left of the area to copy? */
+        if (iStart <= iEnd)
+        {
+            /*
+             * if we stand at a tag, skip over the tag
+             */
+            if (*psz == '@')
+                psz = skip(findEndOfWord(psz+1));
+
+            /*
+             * save start columen
+             */
+            iStartColumn = psz - papszLines[iStart];
+
+            /*
+             * Copy loop.
+             */
+            do
+            {
+                int i;
+                for (i = psz - papszLines[iStart]; i < iStartColumn; i++)
+                    *pszTarget++ = ' '; /* FIXME HTML and indenting... */
+
+                strcpy(pszTarget, psz);
+                trimR(pszTarget);
+                pszTarget += strlen(pszTarget);
+                if (fHTML)
+                    strcpy(pszTarget, "<BR>\n");
+                else
+                    strcpy(pszTarget, "\n");
+                pszTarget += strlen(pszTarget);
+
+                /* Next */
+                psz = skip(papszLines[++iStart]);
+                if (iStart <= iEnd)
+                {
+                    while (psz != NULL && *psz == '*')
+                        ++psz;
+                    psz = skip(psz);
+                    /* end test comment */
+                    if (psz > papszLines[iStart] && psz[-1] == '*' && *psz == '/')
+                        break;
+                }
+            } while (iStart <= iEnd && *psz != '@');
+
+            /*
+             * remove empty lines at end.
+             */
+            if (fHTML)
+            {
+                pszTarget--;
+                while (pszTarget >= pszRet && (*pszTarget == '\n' || *pszTarget == ' '))
+                {
+                    if (*pszTarget == '\n')
+                        pszTarget -= 4;
+                    *pszTarget-- = '\0';
+                }
+            }
+            else
+            {
+                pszTarget--;
+                while (pszTarget >= pszRet && (*pszTarget == '\n' || *pszTarget == ' '))
+                    *pszTarget-- = '\0';
+            }
+        }
+        else
+            pszTarget = '\0';
+    }
+    else
+        pszRet = NULL;
+
+    return pszRet != NULL && *pszRet == '\0' ?  NULL : pszRet;
+}
+
+
+
+/**
+ * Copies a piece of tag/keyword text into an buffer. SDS.
+ * @returns   Pointer to buffer. If iStart > iEnd NULL is returned.
+ * @param     pszTarget  Pointer to buffer.
+ * @param     fHTML      Add HTML tags like <br> or not
+ * @param     iStart     Index of start line.
+ * @param     iEnd       Index of last line.
+ * @param     apszLines  Array lines.
+ * @param     pszStart   Pointer to char to start at (into papszLines[iStart] of course!)
+ * @status    completely impelmented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ * @remark    Addes some HTML tags.
+ */
+static char *CommonCopyTextUntilNextTag(char *pszTarget, BOOL fHTML, int iStart, int iEnd, char **papszLines, const char *pszStart)
+{
+    char *pszRet = pszTarget;
+
+    if (iStart <= iEnd)
+    {
+        /* known keywords */
+        int         iStartColumn;
+        int         i;
+        const char *psz = pszStart != NULL ? pszStart : papszLines[iStart];
+
+        /*
+         * Skip evt. keyword
+         */
+        psz = skip(psz);
+        for (i = 0; pszCommonKeywords[i] != NULL; i++)
+            if (strnicmp(pszCommonKeywords[i], psz, strlen(pszCommonKeywords[i])) == 0)
+            {
+                psz = skip(psz + strlen(pszCommonKeywords[i]));
+                psz = skip(*psz == ':' ? psz + 1 : psz);
+                break;
+            }
+
+        /*
+         * save start columen
+         */
+        iStartColumn = psz - papszLines[iStart];
+
+        /*
+         * copy loop
+         */
+        do
+        {
+            /*
+             * Skip '*'s at start of the line.
+             */
+            while (*psz == '*')
+                psz++;
+
+            /* end comment check */
+            if (psz > papszLines[iStart] && psz[-1] == '*' && *psz == '/')
+                break;
+            psz = skip(psz);
+
+            /*
+             * Indent up to iStartColumn
+             */
+            for (i = psz - papszLines[iStart]; i < iStartColumn; i++)
+                *pszTarget++ = ' '; /* FIXME HTML and indenting... */
+
+            /*
+             * Copy the rest of the line and add HTML break.
+             */
+            strcpy(pszTarget, psz);
+            trimR(pszTarget);
+            pszTarget += strlen(pszTarget);
+            if (fHTML)
+                strcpy(pszTarget, "<BR>\n");
+            else
+                strcpy(pszTarget, "\n");
+            pszTarget += strlen(pszTarget);
+
+            /*
+             * Next
+             */
+            psz = skip(papszLines[++iStart]);
+
+            /*
+             * Check for keyword
+             */
+            if (iStart <= iEnd)
+            {
+                psz = skip(psz);
+                for (i = 0; pszCommonKeywords[i] != NULL; i++)
+                    if (strnicmp(pszCommonKeywords[i], psz, strlen(pszCommonKeywords[i])) == 0)
+                        break;
+                if (pszCommonKeywords[i] != NULL)
+                    break;
+            }
+        } while (iStart < iEnd);
+
+        /*
+         * remove empty lines at end.
+         */
+        if (fHTML)
+        {
+            pszTarget--;
+            while (pszTarget >= pszRet && (*pszTarget == '\n' || *pszTarget == ' '))
+            {
+                if (*pszTarget == '\n')
+                    pszTarget -= 4;
+                *pszTarget-- = '\0';
+            }
+        }
+        else
+        {
+            pszTarget--;
+            while (pszTarget >= pszRet && (*pszTarget == '\n' || *pszTarget == ' '))
+                *pszTarget-- = '\0';
+        }
+    }
+    else
+        pszRet = NULL;
+
+    return pszRet != NULL && *pszRet == '\0' ?  NULL : pszRet;
+}
+
 
 
@@ -1699 +2014 @@
 
 /** first char after word */
-static char *findEndOfWord(char *psz)
+static char *findEndOfWord(const char *psz)
 {
 
@@ -1712 +2027 @@
           )
         ++psz;
-    return psz;
+    return (char *)psz;
 }
 
 
 /** starting char of word */
-static char *findStartOfWord(char *psz, const char *pszStart)
-{
-    char *pszR = psz;
+static char *findStartOfWord(const char *psz, const char *pszStart)
+{
+    const char *pszR = psz;
     while (psz >= pszStart &&
             (
@@ -1729 +2044 @@
           )
         pszR = psz--;
-    return pszR;
+    return (char*)pszR;
 }
 
@@ -1740 +2055 @@
  * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
  */
-static char *trim(char *psz)
+inline char *trim(char *psz)
 {
     int i;
@@ -1752 +2067 @@
     psz[i+1] = '\0';
     return psz;
+}
+
+
+/**
+ * Right trims a string, ie. removing spaces (and tabs) from the end of the string.
+ * @returns   Pointer to the string passed in.
+ * @param     psz   Pointer to the string which is to be right trimmed.
+ * @status    completely implmented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+inline char *trimR(char *psz)
+{
+    int i;
+    if (psz == NULL)
+        return NULL;
+    i = strlen(psz) - 1;
+    while (i >= 0 && (psz[i] == ' ' || *psz == '\t'))
+        i--;
+    psz[i+1] = '\0';
+    return psz;
+}
+
+
+/**
+ * skips blanks until first non-blank.
+ * @returns   Pointer to first not space or tab char in the string.
+ * @param     psz   Pointer to the string.
+ * @status    completely implmented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+inline char *skip(const char *psz)
+{
+    if (psz == NULL)
+        return NULL;
+
+    while (*psz == ' ' || *psz == '\t')
+        psz++;
+    return (char*)psz;
 }
 
@@ -1992 +2345 @@
 }
 
+
+/**
+ * Finds a string in a range of pages.
+ * @returns   Index of the line (into ppaszLines).
+ * @param     psz         String to search for.
+ * @param     iStart      Start line.
+ * @param     iEnd        Line to stop at
+ * @param     papszLines  Array of lines to search within.
+ * @status    completely implemented.
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+static int findStrLine(const char *psz, int iStart, int iEnd, char **papszLines)
+{
+    while (iStart <= iEnd &&
+           stristr(papszLines[iStart], psz) == NULL)
+        iStart++;
+    return iStart;
+}
+
+
+
+

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.10 2000-02-14 17:18:31 bird Exp $ *
+/* $Id: db.cpp,v 1.11 2000-02-18 12:42:06 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -80 +80 @@
 static unsigned long CheckAuthorError(char * &pszError, const char *pszFieldName, const char *pszFieldValue, const char *pszQuery);
 static unsigned long logDbError(char * &pszError, const char *pszQuery);
+static char *sqlstrcat(char *pszQuery, const char *pszBefore, const char *pszStr, const char *pszAfter = NULL);
+
 #ifndef DLL
     extern "C" void      dbHandler(int sig);
@@ -297 +299 @@
     int  rc;
     long lFunction = -1;
-    char szQuery[256];
+    char szQuery[512];
     MYSQL_RES *pres;
 
@@ -596 +598 @@
  *                       This doesn't have to be the name. Initials, alias and email
  *                       is also searched.
- */
-signed long _System dbFindAuthor(const char *pszAuthor)
+ * @param     pszEmail   Email address. Might be NULL!
+ */
+signed long _System dbFindAuthor(const char *pszAuthor, const char *pszEmail)
 {
     signed long refcode = -1;
     MYSQL_RES *pres;
-    char szQuery[256];
-
+    char szQuery[512];
+
+    /*
+     * parameter validations
+     */
+    if (pszAuthor == NULL || strlen(pszAuthor) > 64)
+        return -1;
+    if (pszEmail != NULL && strlen(pszEmail) > 64)
+    {
+        fprintf(stderr, "email too long!");
+        return -1;
+    }
+
+    /*
+     * Query
+     */
     sprintf(&szQuery[0],
             "SELECT refcode FROM author "
@@ -610 +627 @@
             "      email    = '%s'",
             pszAuthor, pszAuthor, pszAuthor, pszAuthor);
+
+    if (pszEmail != NULL)
+        sprintf(&szQuery[strlen(&szQuery[0])], " OR email = '%s'", pszEmail);
+
     if (mysql_query(pmysql, &szQuery[0]) >= 0)
     {
@@ -702 +723 @@
     MYSQL_RES *     pres;
     MYSQL_ROW       row;
-    char            szQuery[512];
-    char *          pszQuery = &szQuery[0];
+    char *          pszQuery2 = (char*)malloc(65500);
+    char *          pszQuery = pszQuery2;
     long            lCurrentState;
     int             i,k,rc;
     unsigned long   ulRc = 0;
 
+    /* check if malloc have failed allocating memory for us. */
+    if (pszQuery2 == NULL)
+    {
+        strcpy(pszError, "internal dbUpdateFunction error - malloc failed!\n");
+        return 1;
+    }
+
+
+    /*
+     * Loop thru all functions in the array of refocodes.
+     */
     for (k = 0; k < pFnDesc->cRefCodes; k++)
     {
@@ -717 +749 @@
         sprintf(pszQuery, "UPDATE function SET updated = updated + 1 WHERE refcode = %ld",
                 pFnDesc->alRefCode[k]);
-        rc = mysql_queryu1(pmysql, &szQuery[0]);
+        rc = mysql_queryu1(pmysql, pszQuery2);
 
 
@@ -724 +756 @@
          */
         lCurrentState = dbGetFunctionState(pFnDesc->alRefCode[k]);
-        if (lCurrentState == -1)
+        if (lCurrentState == -1 && dbGetLastErrorDesc() != NULL && strlen(dbGetLastErrorDesc()) != 0)
         {
             strcpy(pszError, dbGetLastErrorDesc());
+            free(pszQuery2);
             return 1;
         }
@@ -736 +769 @@
         strcpy(pszQuery, "UPDATE function SET ");
         pszQuery += strlen(pszQuery);
-        if (pFnDesc->lStatus != 99 || lCurrentState == 0)
-        {
-            sprintf(pszQuery, "state = %ld ", pFnDesc->lStatus);
+
+        /* Status */
+        if (lCurrentState != pFnDesc->lStatus
+            && pFnDesc->lStatus != 0
+            && (lCurrentState == 0 || pFnDesc->lStatus != 99))
+        {
+            sprintf(pszQuery, "state = %ld", pFnDesc->lStatus);
             f = TRUE;
         }
         pszQuery += strlen(pszQuery);
 
+        /* return type */
         if (pFnDesc->pszReturnType != NULL)
         {
             if (f)  strcat(pszQuery, ", ");
-            sprintf(pszQuery + strlen(pszQuery),  "return = '%s' ", pFnDesc->pszReturnType);
-            pszQuery += strlen(pszQuery);
+            pszQuery = sqlstrcat(pszQuery, "return = ",  pFnDesc->pszReturnType);
             f = TRUE;
         }
 
+        /* Description */
+        if (pFnDesc->pszDescription != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery, "description  = ", pFnDesc->pszDescription);
+            f = TRUE;
+        }
+
+        /* Remark */
+        if (pFnDesc->pszRemark != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery,  "remark = ", pFnDesc->pszRemark);
+            f = TRUE;
+        }
+
+        /* Description */
+        if (pFnDesc->pszReturnDesc != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery,  "returndesc = ", pFnDesc->pszReturnDesc);
+            f = TRUE;
+        }
+
+        /* Sketch */
+        if (pFnDesc->pszSketch != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery,  "sketch = ", pFnDesc->pszSketch);
+            f = TRUE;
+        }
+
+        /* Equiv */
+        if (pFnDesc->pszEquiv != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery,  "equiv = ", pFnDesc->pszEquiv);
+            f = TRUE;
+        }
+
+        /* Equiv */
+        if (pFnDesc->pszTime != NULL)
+        {
+            if (f)  strcat(pszQuery, ", ");
+            pszQuery = sqlstrcat(pszQuery,  "time = ", pFnDesc->pszTime);
+            f = TRUE;
+        }
+
+        /* Execute update query? */
         if (f)
         {
-            sprintf(pszQuery + strlen(pszQuery), "WHERE refcode = %ld", pFnDesc->alRefCode[k]);
-            rc = mysql_queryu2(pmysql, &szQuery[0]);
+            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(), &szQuery[0]);
+                        dbGetLastErrorDesc(), pszQuery2);
                 pszError += strlen(pszError) - 1;
                 ulRc++;
@@ -765 +851 @@
 
 
+
         /*
          * Parameters
          */
-        pszQuery = &szQuery[0];
+        pszQuery = pszQuery2;
         sprintf(pszQuery, "SELECT count(*) FROM parameter WHERE function = %ld", pFnDesc->alRefCode[k]);
         rc = mysql_queryu3(pmysql, pszQuery);
@@ -782 +869 @@
                     for (i = 0; i < pFnDesc->cParams; i++)
                     {
-                        sprintf(pszQuery, "UPDATE parameter SET type = '%s', name = '%s' "
-                                "WHERE function = (%ld) AND sequencenbr = (%ld)",
+                        sprintf(pszQuery, "UPDATE parameter SET type = '%s', name = '%s'",
                                 pFnDesc->apszParamType[i] != NULL ? pFnDesc->apszParamType[i] : "",
-                                pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : "",
-                                pFnDesc->alRefCode[k], i
-                                );
+                                pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : "");
+                        if (pFnDesc->apszParamDesc[i] != NULL)
+                            sqlstrcat(pszQuery, ", description = ", pFnDesc->apszParamDesc[i]);
+                        sprintf(pszQuery + strlen(pszQuery), " WHERE function = (%ld) AND sequencenbr = (%ld)",
+                                pFnDesc->alRefCode[k], i);
                         rc = mysql_queryu4(pmysql, pszQuery);
                         if (rc < 0)
@@ -820 +908 @@
                     for (i = 0; i < pFnDesc->cParams; i++)
                     {
-                        sprintf(pszQuery, "INSERT INTO parameter(function, sequencenbr, type, name) "
-                                "VALUES (%ld, %d, '%s', '%s')",
+                        sprintf(pszQuery, "INSERT INTO parameter(function, sequencenbr, type, name, description) "
+                                "VALUES (%ld, %d, '%s', '%s'",
                                 pFnDesc->alRefCode[k], i,
                                 pFnDesc->apszParamType[i] != NULL ? pFnDesc->apszParamType[i] : "",
                                 pFnDesc->apszParamName[i] != NULL ? pFnDesc->apszParamName[i] : ""
                                 );
-                        rc = mysql_queryu6(pmysql, pszQuery);
+                        if (pFnDesc->apszParamDesc[i] != NULL)
+                            sqlstrcat(pszQuery, ", ", pFnDesc->apszParamDesc[i]);
+                        else
+                            strcat(pszQuery, ", NULL)");
+
+                        rc = mysql_queryu6(pmysql, pszQuery2);
                         if (rc < 0)
                         {
@@ -896 +989 @@
 
     lDll = lDll;
+    free(pszQuery2);
     return ulRc;
 }
@@ -1548 +1642 @@
     mysql_free_result(pres);
     return (signed long)rc;
+}
+
+
+/**
+ *
+ * @returns   Pointer to end of the string.
+ * @param     pszQuery   Outputbuffer
+ * @param     pszBefore  Text before string, might be NULL.
+ * @param     pszStr     String (NOT NULL)
+ * @param     pszAfter   Text after, might be NULL.
+ * @status    completely implemented
+ * @author    knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+ */
+static char *sqlstrcat(char *pszQuery, const char *pszBefore, const char *pszStr, const char *pszAfter)
+{
+    register char ch;
+
+    pszQuery += strlen(pszQuery);
+
+    /*
+     * String before
+     */
+    if (pszBefore != NULL)
+    {
+        strcpy(pszQuery, pszBefore);
+        pszQuery += strlen(pszQuery);
+    }
+
+    /*
+     * THE String
+     */
+    *pszQuery++ = '\'';
+    while ((ch = *pszStr++) != '\0')
+    {
+        if (ch == '\'')
+            *pszQuery++ = '\\';
+        *pszQuery++ = ch;
+    }
+    *pszQuery++ = '\'';
+
+    /*
+     * String after
+     */
+    if (pszAfter != NULL)
+    {
+        strcpy(pszQuery, pszAfter);
+        pszQuery += strlen(pszQuery);
+    }
+    else
+        *pszQuery = '\0';
+
+
+    return pszQuery;
 }
 

trunk/tools/database/db.h

@@ -1 @@
-/* $Id: db.h,v 1.6 2000-02-12 23:54:29 bird Exp $ */
+/* $Id: db.h,v 1.7 2000-02-18 12:42:07 bird Exp $ */
 /*
  * DB - contains all database routines
@@ -32 +32 @@
         /* buffers */
         char  szFnDclBuffer[2048];
-        char  szFnHdrBuffer[2048];
+        char  szFnHdrBuffer[10240];
 
         /* function name and type */
@@ -45 +45 @@
         char *apszParamType[30];
         char *apszParamName[30];
+        char *apszParamDesc[30];
 
         /* authors */
@@ -50 +51 @@
         char *apszAuthor[NBR_AUTHORS];
         long  alAuthorRefCode[NBR_AUTHORS];
+
+        /* other description fields */
+        char *pszDescription;
+        char *pszRemark;
+        char *pszReturnDesc;
+        char *pszSketch;
+        char *pszEquiv;
+        char *pszTime;
 
         /* status */
@@ -93 +102 @@
                                            PFNFINDBUF pFnFindBuf,
                                            signed long lDll);
-    signed long     _System dbFindAuthor(const char *pszAuthor);
+    signed long     _System dbFindAuthor(const char *pszAuthor, const char *pszEmail);
     signed long     _System dbGetFunctionState(signed long lRefCode);
     unsigned long   _System dbUpdateFunction(PFNDESC pFnDesc,

trunk/tools/database/kHtmlPC.cpp

@@ -1 @@
-/* $Id: kHtmlPC.cpp,v 1.2 2000-02-12 17:55:03 bird Exp $ */
+/* $Id: kHtmlPC.cpp,v 1.3 2000-02-18 12:42:07 bird Exp $ */
 /*
  * kHtmlPC - Special-purpose HTML/SQL preprocessor.
@@ -112 +112 @@
 static void          openLog(void);
 static void          closeLog(void);
-static unsigned long processFile(const char *pszFilename/*, const POPTIONS pOptions*/);
+static unsigned long processFile(const char *pszFilenamem, const POPTIONS pOptions);
 static unsigned long tagEndkSql(TAG_PARAMETER_LIST);
 static unsigned long tagkSql(TAG_PARAMETER_LIST);
-static unsigned long tagkTemplate(TAG_PARAMETER_LIST, FILE * &phFile);
+static unsigned long tagkTemplate(TAG_PARAMETER_LIST, FILE * &phFile, const POPTIONS pOptions);
 static unsigned long tagkInclude(TAG_PARAMETER_LIST);
-static unsigned long tagkGraph(TAG_PARAMETER_LIST);
+static unsigned long tagkGraph(TAG_PARAMETER_LIST, const POPTIONS pOptions);
 static unsigned long tagkDefine(TAG_PARAMETER_LIST);
 static unsigned long tagkUndef(TAG_PARAMETER_LIST);
@@ -155 +155 @@
     char           *pszUser     = "root";
     char           *pszPasswd   = "";
+    char            szPathName[CCHMAXPATH];
+    OPTIONS         options = {"."};
+
 
     /* signal handler */
@@ -167 +170 @@
     * parse arguments.
     * options:  -h or -?     help
+    *           -b:<basepath> Basepath for output files.
     *           -d:<dbname>   Database name
     *           -p:<passwd>   Password
@@ -181 +185 @@
             switch (argv[argi][1])
             {
+                case 'b':
+                case 'B':
+                    printf("%s\n", argv[argi]);
+                    if (argv[argi][2] == ':')
+                    {
+                        if (_fullpath(&szPathName[0], &argv[argi][3], sizeof(szPathName)) != NULL)
+                            options.pszBaseDir = &szPathName[0];
+                        else
+                        {
+                            fprintf(stderr, "error: basepath '%s' don't exists\n", &argv[argi][3]);
+                            fFatal = TRUE;
+                        }
+                    }
+                    else
+                    {
+                        fprintf(stderr, "error: option '-b:' requires a directory name.\n");
+                        fFatal = TRUE;
+                    }
+                    break;
+
                 case 'd':
                 case 'D':
@@ -186 +210 @@
                         pszDatabase = &argv[argi][3];
                     else
-                        fprintf(stderr, "warning: option '-d:' requires database name.\n");
+                    {
+                        fprintf(stderr, "error: option '-d:' requires database name.\n");
+                        fFatal = TRUE;
+                    }
                     break;
 
@@ -205 +232 @@
                         pszPasswd = &argv[argi][3];
                     else
-                        fprintf(stderr, "warning: option '-p:' requires password.\n");
+                    {
+                        fprintf(stderr, "error: option '-p:' requires password.\n");
+                        fFatal = TRUE;
+                    }
                     break;
 
@@ -213 +243 @@
                         pszUser = &argv[argi][3];
                     else
+                    {
                         fprintf(stderr, "error: option '-u:' requires userid.\n");
+                        fFatal = TRUE;
+                    }
                     break;
 
@@ -233 +266 @@
             if (dbConnect(pszHost, pszUser, pszPasswd, pszDatabase))
             {
-                ulRc += processFile(argv[argi]/*, &options*/);
+                ulRc += processFile(argv[argi], &options);
                 dbDisconnect();
             }
@@ -330 +363 @@
  * @remark    Big function!
  */
-static unsigned long processFile(const char *pszFilename/*, const POPTIONS pOptions*/)
+static unsigned long processFile(const char *pszFilename, const POPTIONS pOptions)
 {
     unsigned long                      ulRc = 0;
@@ -454 +487 @@
                             ulRc2 = tagEndkSql(TAG_PARAMETERS);
                         else if (tag.isTag("!kTemplate"))               /* !kTemplate   */
-                            ulRc2 = tagkTemplate(TAG_PARAMETERS, phFile);
+                            ulRc2 = tagkTemplate(TAG_PARAMETERS, phFile, pOptions);
                         else if (tag.isTag("!kInclude"))                /* !kInclude    */
                             ulRc2 = tagkInclude(TAG_PARAMETERS);
                         else if (tag.isTag("!kGraph"))                  /* !kGraph      */
-                            ulRc2 = tagkGraph(TAG_PARAMETERS);
+                            ulRc2 = tagkGraph(TAG_PARAMETERS, pOptions);
                         else if (tag.isTag("!kDefine"))                 /* !kDefine     */
                             ulRc2 = tagkDefine(TAG_PARAMETERS);
@@ -714 +747 @@
  * @returns   low  word: number of errors
  *            high word: number of warnings
- * @param     phFile  Reference to current output file.
+ * @param     phFile    Reference to current output file.
+ * @param     pOptions  Pointer to the options struct.
  * @remark    See TAG_PARAMETER_LIST for parameters.
  *            Use TAG_PARAMETERS when calling this function.
  */
-static unsigned long tagkTemplate(TAG_PARAMETER_LIST, FILE * &phFile)
+static unsigned long tagkTemplate(TAG_PARAMETER_LIST, FILE * &phFile, const POPTIONS pOptions)
 {
     unsigned long    ulRc = 0;
@@ -734 +768 @@
     if (pszFilename != NULL)
     {
+        char  szFullFileName[CCHMAXPATH];
         if (phFile != NULL)
             fclose(phFile);
-
-        phFile = fopen(pszFilename, "wb");
-        if (phFile != NULL)
-            fprintf(phLog, "%s(%ld) : info: new output file, '%s'.\n",
-                    pCurFile->getFilename(), pCurFile->getLineNumber()+1, pszFilename);
+        if (strlen(pszFilename) + strlen(pOptions->pszBaseDir) + 1 + 1 < sizeof(szFullFileName))
+        {
+            sprintf(&szFullFileName[0], "%s\\%s", pOptions->pszBaseDir, pszFilename);
+            phFile = fopen(&szFullFileName[0], "wb");
+            if (phFile != NULL)
+                fprintf(phLog, "%s(%ld) : info: new output file, '%s'.\n",
+                        pCurFile->getFilename(), pCurFile->getLineNumber()+1, &szFullFileName[0]);
+            else
+            {
+                fprintf(phLog, "%s(%ld) : error: kTemplate - error opening output file '%s'.\n",
+                        pCurFile->getFilename(), pCurFile->getLineNumber()+1, &szFullFileName[0]);
+                ulRc += 0x00000001;
+            }
+        }
         else
         {
-            fprintf(phLog, "%s(%ld) : error: kTemplate - error opening output file '%s'.\n",
-                    pCurFile->getFilename(), pCurFile->getLineNumber()+1, pszFilename);
+            fprintf(phLog, "%s(%ld) : error: kTemplate - filename and base dir is too long! '%s\\%s'.\n",
+                    pCurFile->getFilename(), pCurFile->getLineNumber()+1, pOptions->pszBaseDir, pszFilename);
             ulRc += 0x00000001;
         }
@@ -799 +843 @@
  *            Use TAG_PARAMETERS when calling this function.
  */
-static unsigned long tagkGraph(TAG_PARAMETER_LIST)
+static unsigned long tagkGraph(TAG_PARAMETER_LIST, const POPTIONS pOptions)
 {
     unsigned long ulRc = 0;
@@ -814 +858 @@
     try
     {
-        kGraph graph(tag);
+        kGraph graph(tag, pOptions->pszBaseDir);
         graph.showWarnings(phLog, pCurFile);
         graph.save();
@@ -2242 +2286 @@
 /**
  * Analyses the tag and executes SQL statements.
- * @param     tag  Tag.
+ * @param     tag         Tag.
+ * @param     pszBaseDir  Base output directory.
  * @remark    Throws kError::enmErrors
  */
-void  kGraph::analyseTag(const kTag &tag) throw(kError::enmErrors)
+void  kGraph::analyseTag(const kTag &tag, const char *pszBaseDir) throw(kError::enmErrors)
 {
     int cArgs,    i;
@@ -2297 +2342 @@
         {
             if (pszValue == NULL || strlen(pszValue) == 0) throw(kError::error_filename_param_is_missing_value);
-            pszFilename = dupeString(pszValue);
+            pszFilename = new char[strlen(pszValue) + 2 + strlen(pszBaseDir)];
+            if (pszFilename == NULL) throw(kError::error_filename_param_is_missing_value);
+            sprintf(pszFilename, "%s\\%s", pszBaseDir, pszValue);
         }
         else if (stricmp(pszName, "title") == 0)
@@ -3125 +3172 @@
  * @remark    Throws kError::enmError on error.
  */
-kGraph::kGraph(const kTag &tag) throw(kError::enmErrors)
+kGraph::kGraph(const kTag &tag, const char *pszBaseDir) throw(kError::enmErrors)
     : pGraph(NULL), enmTypeCd(unknown), enmSubTypeCd(normal),
     pszFilename(NULL), pszTitle(NULL), pszTitleX(NULL),
@@ -3137 +3184 @@
     try
     {
-        analyseTag(tag);
+        analyseTag(tag, pszBaseDir);
         createBaseGraph();
         if (fLegend)
@@ -3163 +3210 @@
 /**
  * Saves the graph to the filename specified in the tag.
+ * 2
  * @returns   Errorcode.
  */

trunk/tools/database/kHtmlPC.h

@@ -1 @@
-/* $Id: kHtmlPC.h,v 1.1 1999-09-05 02:53:06 bird Exp $ */
+/* $Id: kHtmlPC.h,v 1.2 2000-02-18 12:42:08 bird Exp $ */
 /*
  * kHtmlPC - Special-purpose HTML/SQL preprocessor.
@@ -17 +17 @@
     typedef struct _options
     {
-        BOOL fDummy;
+        char *pszBaseDir;
     } OPTIONS, *POPTIONS;
 
@@ -428 +428 @@
 
             /**@cat internal function */
-            void    analyseTag(const kTag &tag)     throw(kError::enmErrors);
+            void    analyseTag(const kTag &tag, const char *pszBaseDir)     throw(kError::enmErrors);
             void    fetchData(const char *pszSql)   throw(kError::enmErrors);
             kGraphDataSet *findOrCreateDataSet(const char *pszLegend) throw(kError::enmErrors);
@@ -450 +450 @@
 
         public:
-            kGraph(const kTag &tag) throw(kError::enmErrors);
+            kGraph(const kTag &tag, const char *pszBaseDir) throw(kError::enmErrors);
             ~kGraph(void);
 

trunk/tools/database/sample.kSqlHtml

@@ -1 @@
-<!-- $Id: sample.kSqlHtml,v 1.2 2000-02-12 17:55:04 bird Exp $
+<!-- $Id: sample.kSqlHtml,v 1.3 2000-02-18 12:42:08 bird Exp $
   --
   -- kSqlHTML Template Sample.
@@ -186 +186 @@
 <BODY>
 <H1>Details on APIs in $(dllname)</H1>
+<P>
+<IMAGE SRC="odin32Dll$(dllname).gif">
+</P>
 <TABLE BORDER=1 BORDERCOLOR="#000000" CELLPADDING=4 CELLSPACING=0>
     <THEAD>
-        <TR VALIGN=TOP> <TH>Ordinal</TH> <TH>API name</TH> <TH>State</TH> </TR>
+        <TR VALIGN=TOP> <TH>Ordinal</TH> <TH>API name</TH> <TH>Author(s)</TH> <TH>State</TH> </TR>
     </THEAD>
     <TBODY>
         <!kSql sql="SELECT ordinal,
                            function.name AS functionname,
-                           state.name AS statename
+                           state.name AS statename,
+                           function.refcode AS fnrefcode
                        FROM function, state
                        WHERE state.refcode = state
-                             AND dll = $(dllrefcode)"
+                             AND dll = $(dllrefcode)
+                       ORDER BY function.name"
         ><TR>
             <TD><P ALIGN=RIGHT>$(ordinal)<P></TD>
             <TD><P ALIGN=LEFT>$(functionname)<P></TD>
+            <TD><!kSql sql="SELECT name AS authorname
+                            FROM fnauthor fna, author a
+                            WHERE function = $(fnrefcode) AND fna.author = a.refcode"
+           ><P ALIGN=RIGHT>$(authorname)<P><!/kSql>
+            </TD>
             <TD><P ALIGN=LEFT>$(statename)<P></TD>
         </TR><!/kSql>