Changeset 1282

Timestamp:

03/19/10 08:04:03 (4 months ago)

Author:

Gary

Message:

unxsVZ tGlossary functionality work in progress.

Location:

trunk

Files:

• mainfunc.h (modified) (3 diffs)
• tglossary.c (modified) (1 diff)
• tglossaryfunc.h (modified) (1 diff)

trunk/mainfunc.h

@@ -921 +921 @@
         unsigned uJobContainerIndex=0;
         unsigned uTemplateLabelIndex=0;
+        unsigned uGlossaryLabelIndex=0;
 
         printf("UpdateSchema(): Start\n");
@@ -1002 +1003 @@
         mysql_free_result(res);
 
+        sprintf(gcQuery,"SHOW INDEX IN tGlossary");
+        mysql_query(&gMysql,gcQuery);
+        if(mysql_errno(&gMysql))
+                printf("%s\n",mysql_error(&gMysql));
+        mysql_query(&gMysql,gcQuery);
+        res=mysql_store_result(&gMysql);
+        while((field=mysql_fetch_row(res)))
+        {
+                if(!strcmp(field[2],"cLabel")) uGlossaryLabelIndex=1;
+        }
+        mysql_free_result(res);
+
         if(uIncorrectVeth)
         {
@@ -1172 +1185 @@
                 else
                         printf("Added INDEX cLabel tTemplate\n");
+        }
+
+        if(!uGlossaryLabelIndex)
+        {
+                sprintf(gcQuery,"ALTER TABLE tGlossary ADD INDEX (cLabel)");
+                mysql_query(&gMysql,gcQuery);
+                if(mysql_errno(&gMysql))
+                        printf("%s\n",mysql_error(&gMysql));
+                else
+                        printf("Added INDEX cLabel tGlossary\n");
         }
 

trunk/tglossary.c

@@ -557 +557 @@
 void CreatetGlossary(void)
 {
-        sprintf(gcQuery,"CREATE TABLE IF NOT EXISTS tGlossary ( uGlossary INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, cLabel VARCHAR(32) NOT NULL DEFAULT '', uOwner INT UNSIGNED NOT NULL DEFAULT 0,index (uOwner), uCreatedBy INT UNSIGNED NOT NULL DEFAULT 0, uCreatedDate INT UNSIGNED NOT NULL DEFAULT 0, uModBy INT UNSIGNED NOT NULL DEFAULT 0, uModDate INT UNSIGNED NOT NULL DEFAULT 0, cText TEXT NOT NULL DEFAULT '' )");
+        sprintf(gcQuery,"CREATE TABLE IF NOT EXISTS tGlossary ( uGlossary INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, cLabel VARCHAR(32) NOT NULL DEFAULT '',INDEX (cLabel), uOwner INT UNSIGNED NOT NULL DEFAULT 0,INDEX (uOwner), uCreatedBy INT UNSIGNED NOT NULL DEFAULT 0, uCreatedDate INT UNSIGNED NOT NULL DEFAULT 0, uModBy INT UNSIGNED NOT NULL DEFAULT 0, uModDate INT UNSIGNED NOT NULL DEFAULT 0, cText TEXT NOT NULL DEFAULT '' )");
         MYSQL_RUN;
 

trunk/tglossaryfunc.h

@@ -285 +285 @@
                         printf("<a class=darkLink href=unxsVZ.cgi?gcFunction=tGlossary&uGlossary=%s>%s</a>",
                                         field[0],field[1]);
-                        printf(" <a class=darkLink href=# onClick=\"open_popup('?gcFunction=Glossary&cLabel=%s')\">"
-                                        "Popup</a><br>",field[1]);
+                        printf(" (<a class=darkLink href=# onClick=\"open_popup('?gcFunction=Glossary&cLabel=%s')\">"
+                                        "preview</a>)<br>",field[1]);
                 }
         }