Changeset 6677 for trunk/tools/database/www/Odin32DBHelpers.php3
- Timestamp:
- Sep 7, 2001, 12:26:42 PM (24 years ago)
- File:
-
- 1 edited
-
trunk/tools/database/www/Odin32DBHelpers.php3 (modified) (58 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/tools/database/www/Odin32DBHelpers.php3
r6664 r6677 113 113 114 114 /** 115 * Compute completion percentage for a dll.115 * Compute completion percentage for a module. 116 116 * @returns Completion percentage. Range 0-100. 117 117 * On error -1 or -2 is returned. 118 * @param $i Dll Dllreference code.119 * @param $db Database connection variable.120 * @sketch Get total number of function in the dll.121 * Get number of completed functions in the dll.118 * @param $iModule Module reference code. 119 * @param $db Database connection variable. 120 * @sketch Get total number of function in the module. 121 * Get number of completed functions in the module. 122 122 * return complete*100 / total 123 123 * @status Completely implemented … … 125 125 * @remark 126 126 */ 127 function Odin32DBComputeCompletion($i Dll, $db)128 { 129 /* 130 * Count the total number of functions in the DLL.127 function Odin32DBComputeCompletion($iModule, $db) 128 { 129 /* 130 * Count the total number of functions in the module. 131 131 */ 132 132 $sql = sprintf("SELECT SUM(s.weight)/COUNT(f.state) … … 136 136 WHERE 137 137 f.state = s.refcode 138 AND dll= %d",139 $i Dll);138 AND module = %d", 139 $iModule); 140 140 if (($result = mysql_query($sql, $db)) && mysql_num_rows($result) < 1) 141 141 { … … 165 165 166 166 /** 167 * Draws a completion bar for a dll (or all dlls).168 * @param $i Dll Dllreference code.167 * Draws a completion bar for a module (or all modules.). 168 * @param $iModule Module reference code. 169 169 * If < 0 then for the entire project. 170 * @param $i DllName Dllname.170 * @param $iModName Module name. 171 171 * @param $db Database connection variable. 172 172 * @sketch Call Odin32DBCompletionBar2 with an appropriate condition. … … 174 174 * @author knut st. osmundsen (knut.stange.osmundsen@mynd.no) 175 175 */ 176 function Odin32DBCompletionBar Dll($iDll, $sDllName, $db)177 { 178 if ($i Dll< 0)179 return Odin32DBcompletionBar2("", $s DllName, $db);180 return Odin32DBcompletionBar2(" dll = ".$iDll, $sDllName, $db);176 function Odin32DBCompletionBarModule($iModule, $sModName, $db) 177 { 178 if ($iModule < 0) 179 return Odin32DBcompletionBar2("", $sModName, $db); 180 return Odin32DBcompletionBar2("module = ".$iModule." AND f.type IN ('A', 'I')", $sModName, $db); 181 181 } 182 182 … … 221 221 { 222 222 /* 223 * Count the total number of functions in the DLL.223 * Count the total number of functions for the author. 224 224 */ 225 225 $sql = "SELECT COUNT(*) FROM fnauthor fa JOIN function f\n". 226 "WHERE fa.function = f.refcode AND fa.author = ".$iAuthor ;226 "WHERE fa.function = f.refcode AND fa.author = ".$iAuthor." AND f.type IN ('A', 'I')"; 227 227 if (($result = mysql_query($sql, $db)) && mysql_num_rows($result) < 1) 228 228 { … … 260 260 " fa.author = ".$iAuthor." AND\n". 261 261 " fa.function = f.refcode AND\n". 262 " f.state = s.refcode\n". 262 " f.state = s.refcode AND\n". 263 " f.type IN ('A', 'I')\n". 263 264 "GROUP BY s.refcode\n". 264 265 "ORDER BY state\n"; … … 295 296 /** 296 297 * Draws a completion bar. 297 * @param $ iDll Dll reference code.298 * If < 0 then for the entire project.299 * @param $db Database connection variable.300 * @sketch Get total number of function in the dll.298 * @param $sCondition Where conditions. 299 * @param $sName Name... 300 * @param $db Database connection variable. 301 * @sketch Get total number of function in the selection. 301 302 * Get the number of function per status. (+state color) 302 303 * Draw bar. … … 307 308 { 308 309 /* 309 * Count the total number of functions in the DLL.310 * Count the total number of functions in selection. 310 311 */ 311 312 $sql = "SELECT COUNT(*) FROM function f"; … … 391 392 { 392 393 /* 393 * Count the total number of functions in the DLL. 394 */ 395 $sql = "SELECT 396 name, 397 color 398 FROM 399 state 400 ORDER BY refcode"; 394 * Select the states. 395 */ 396 $sql = "SELECT name, 397 color 398 FROM state 399 ORDER BY refcode"; 401 400 if (($result = mysql_query($sql, $db)) && mysql_num_rows($result) < 1) 402 401 { … … 668 667 /** 669 668 * Writes the a function listing base sqlstatement with these columns (ordered): 670 * 0. dllrefcode671 * 1. dllname669 * 0. Module refcode 670 * 1. Module name 672 671 * 2. number of functions 673 672 * … … 677 676 * @author knut st. osmundsen (knut.stange.osmundsen@mynd.no) 678 677 */ 679 function Odin32DBWrite Dlls($sql, $db)678 function Odin32DBWriteModules($sql, $db) 680 679 { 681 680 if ($result2 = mysql_query($sql, $db)) … … 685 684 echo "\n<table width=100% border=0 cellpadding=0>\n". 686 685 "<tr>\n". 687 " <td width=75%><font size=-1><b> Dlls</b></font></td>\n".686 " <td width=75%><font size=-1><b>Modules</b></font></td>\n". 688 687 " <td align=right><font size=-1><b>Functions</b></font></td>\n". 689 688 "</tr>\n"; 690 689 while ($aFunction = mysql_fetch_array($result2)) 691 690 printf("<tr>". 692 "<td><font size=-1><a href=\"Odin32DB.phtml? dllrefcode=%s\">%s</a></font></td>".691 "<td><font size=-1><a href=\"Odin32DB.phtml?modrefcode=%s\">%s</a></font></td>". 693 692 "<td align=right><font size=-1>%s</font></td>". 694 693 "</tr>\n", … … 762 761 /** 763 762 * Writes the a function listing base sqlstatement with these columns (ordered): 764 * 0. dllrefcode765 * 1. dllname763 * 0. module refcode 764 * 1. module name 766 765 * 2. function refcode 767 766 * 3. function name … … 775 774 * @author knut st. osmundsen (knut.stange.osmundsen@mynd.no) 776 775 */ 777 function Odin32DBWriteFunctionsWith Dlls($sql, $db, $sURLArgs)776 function Odin32DBWriteFunctionsWithModules($sql, $db, $sURLArgs) 778 777 { 779 778 if ($result2 = mysql_query($sql, $db)) … … 783 782 echo "\n<table width=100% border=0 cellpadding=0>\n". 784 783 "<tr>\n". 785 " <td width=30%><font size=-1><b> DllName</b></font></td>\n".784 " <td width=30%><font size=-1><b>Module Name</b></font></td>\n". 786 785 " <td width=45%><font size=-1><b>Function Name</b></font></td>\n". 787 786 " <td><font size=-1><b>State</b></font></td>\n". … … 789 788 while ($aFunction = mysql_fetch_row($result2)) 790 789 printf("<tr>". 791 "<td><font size=-1><a href=\"Odin32DB.phtml? dllrefcode=%s\">%s</a></font></td>".790 "<td><font size=-1><a href=\"Odin32DB.phtml?modrefcode=%s\">%s</a></font></td>". 792 791 "<td><font size=-1><a href=\"Odin32DB.phtml?functionrefcode=%s\">%s</a></font></td>". 793 792 "<td><font size=-1 color=%s>%s</font></td>". … … 809 808 810 809 echo "<p>Click <a href=\"Odin32DB.phtml#functions?".$sURLArgs."\">here</a> to view functions sorted ". 811 ($fSortByState ? "alphabetical by dll" : "by state"). ".<br>";810 ($fSortByState ? "alphabetical by module" : "by state"). ".<br>"; 812 811 } 813 812 else … … 953 952 954 953 echo "<a href=\"Odin32DB.phtml\">Root</a>\n". 955 " - <a href=\"Odin32DB.phtml? dlls=1\">Dlls</a>\n".954 " - <a href=\"Odin32DB.phtml?modules=1\">Moduless</a>\n". 956 955 " - <a href=\"Odin32DB.phtml?authors=1\">Authors</a>\n". 957 956 " - <a href=\"Odin32DB.phtml?apigroups=1\">API Groups</a>\n"; … … 986 985 echo 987 986 "<a href=\"Odin32DB.phtml\">Root</a>\n". 988 " - <a href=\"Odin32DB.phtml? dlls=1\">Dlls</a>\n".987 " - <a href=\"Odin32DB.phtml?moduless=1\">Modules</a>\n". 989 988 " - <a href=\"Odin32DB.phtml?authors=1\">Authors</a>\n". 990 989 " - <a href=\"Odin32DB.phtml?apigroups=1\">API Groups</a>\n"; … … 1029 1028 " a.name AS aliasname,\n". 1030 1029 " a.refcode AS aliasrefcode,\n". 1031 " ad.name AS alias dllname,\n".1032 " ad.refcode AS alias dllrefcode,\n".1033 " d.name AS dllname,\n".1034 " d.refcode AS dllrefcode,\n".1030 " ad.name AS aliasnmodname,\n". 1031 " ad.refcode AS aliasmodrefcode,\n". 1032 " d.name AS modname,\n". 1033 " d.refcode AS modrefcode,\n". 1035 1034 " i.name AS filename,\n". 1036 1035 " i.refcode AS filerefcode,\n". … … 1040 1039 " function f\n". 1041 1040 " LEFT OUTER JOIN function a ON f.aliasfn = a.refcode\n". 1042 " LEFT OUTER JOIN dll ad ON a.dll= ad.refcode\n".1041 " LEFT OUTER JOIN module ad ON a.module = ad.refcode\n". 1043 1042 " LEFT OUTER JOIN apigroup g ON f.apigroup = g.refcode\n". 1044 " LEFT JOIN dll d ON f.dll= d.refcode\n".1043 " LEFT JOIN module d ON f.module = d.refcode\n". 1045 1044 " LEFT JOIN state s ON f.state = s.refcode\n". 1046 1045 " LEFT OUTER JOIN file i ON f.file = i.refcode\n". … … 1064 1063 Odin32DBInfoRow1("Type", $array, "type", "", "","invalid",""); 1065 1064 Odin32DBInfoRow1("State", $array, "state", "", "","invalid",""); 1066 Odin32DBInfoRow1(" Dll", $array, "dllname", "dllrefcode", "dllrefcode","","");1065 Odin32DBInfoRow1("Module", $array, "modname", "modrefcode", "modrefcode","",""); 1067 1066 Odin32DBInfoRow1("Ordinal", $array, "ordinal","","","not available",""); 1068 1067 if (isset($array["apigroupname"])) 1069 1068 Odin32DBInfoRow1("API Group", $array, "apigroupname", "apigrouprefcode", "apigrouprefcode","",""); 1070 1069 Odin32DBInfoRow1("File", $array, "filename", "filerefcode", "filerefcode", "not available", 1071 " (<a href=\"cvs.phtml#".$array["line"]."?sFile=./src/".$array[" dllname"]."/".$array["filename"].",v&sRevision=\">cvs</a>)");1070 " (<a href=\"cvs.phtml#".$array["line"]."?sFile=./src/".$array["modname"]."/".$array["filename"].",v&sRevision=\">cvs</a>)"); 1072 1071 if ($array["line"] > 0) 1073 1072 Odin32DBInfoRow1("Line", $array, "line", "", "","",""); … … 1075 1074 Odin32DBInfoRow1("Line", $array, "unavailable", "", "","not available",""); 1076 1075 if (isset($array["aliasrefcode"])) 1077 Odin32DBInfoRow2("Forwards", $array, "alias dllname", "aliasdllrefcode", "dllrefcode","",".",1076 Odin32DBInfoRow2("Forwards", $array, "aliasmodname", "aliasmodrefcode", "modrefcode","",".", 1078 1077 "aliasname", "aliasrefcode", "functionrefcode"); 1079 1078 else 1080 1079 { 1081 1080 $sql = sprintf("SELECT\n". 1082 " d.name AS dllname,\n".1083 " d.refcode AS dllrefcode,\n".1081 " m.name AS modname,\n". 1082 " m.refcode AS modrefcode,\n". 1084 1083 " f.name AS fnname,\n". 1085 1084 " f.refcode AS fnrefcode\n". 1086 1085 "FROM\n". 1087 1086 " function f,\n". 1088 " dll d\n".1087 " module m\n". 1089 1088 "WHERE\n". 1090 1089 " f.aliasfn = %d AND\n". 1091 " f. dll = d.refcode\n".1092 "ORDER BY d.name, f.name\n",1090 " f.module = m.refcode\n". 1091 "ORDER BY m.name, f.name\n", 1093 1092 $iRefcode); 1094 1093 if (($result2 = mysql_query($sql, $db))) … … 1102 1101 if ($f) $sValue = $sValue."<br>"; 1103 1102 else $f = 1; 1104 $sValue = $sValue."<a href=\"Odin32DB.phtml? dllrefcode=".1105 $aAlias[" dllrefcode"]."\">".$aAlias["dllname"]."</a>.".1103 $sValue = $sValue."<a href=\"Odin32DB.phtml?modrefcode=". 1104 $aAlias["modrefcode"]."\">".$aAlias["modname"]."</a>.". 1106 1105 "<a href=\"Odin32DB.phtml?functionrefcode=". 1107 1106 $aAlias["fnrefcode"]."\">".$aAlias["fnname"]."</a>"; … … 1245 1244 1246 1245 /** 1247 * Writes standard dllinfo.1246 * Writes standard module info. 1248 1247 * 1249 1248 * @returns void 1250 1249 * @param $db Database handle. 1251 * @param $iRefcode Dllreference code.1250 * @param $iRefcode Module reference code. 1252 1251 * @param $fFunctions Flags which tells wether to list all functions or not. 1253 1252 * @param $fFiles Flags which tells wether to list all files or not. … … 1260 1259 * @remark 1261 1260 */ 1262 function Odin32DB DllInfo($db, $iRefcode, $fFunctions, $fFiles, $fAPIGroups, $fAuthors, $fSortByState)1263 { 1264 $sURLArgs = " dllrefcode=".$iRefcode.1261 function Odin32DBModuleInfo($db, $iRefcode, $fFunctions, $fFiles, $fAPIGroups, $fAuthors, $fSortByState) 1262 { 1263 $sURLArgs = "modrefcode=".$iRefcode. 1265 1264 ($fFunctions ? "&fFunctions=1" : ""). 1266 1265 ($fFiles ? "&fFiles=1" : ""). … … 1272 1271 * Navigation - TOP 1273 1272 */ 1274 $sExpand = " dllrefcode=".$iRefcode."&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1";1273 $sExpand = "modrefcode=".$iRefcode."&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1"; 1275 1274 if ($fSortByState) $sExpand = $sExpand."&fSortByState=".$fSortByState; 1276 $sCollapse = " dllrefcode=".$iRefcode;1275 $sCollapse = "modrefcode=".$iRefcode; 1277 1276 Odin32DBNavigationTop($sExpand, $sCollapse); 1278 1277 … … 1281 1280 */ 1282 1281 $sql = sprintf("SELECT\n". 1283 " d.name AS name,\n".1284 " d.description AS description,\n".1282 " m.name AS name,\n". 1283 " m.description AS description,\n". 1285 1284 " c.description AS type\n". 1286 1285 "FROM\n". 1287 " dlld,\n".1286 " module d,\n". 1288 1287 " code c\n". 1289 1288 "WHERE\n". 1290 1289 " c.codegroup = 'DTYP' AND\n". 1291 " d.type = c.code AND\n".1292 " d.refcode = %d",1290 " m.type = c.code AND\n". 1291 " m.refcode = %d", 1293 1292 $iRefcode); 1294 1293 if (($result = mysql_query($sql, $db)) && mysql_num_rows($result) > 0 && ($array = mysql_fetch_array($result))) … … 1307 1306 " function\n". 1308 1307 "WHERE\n". 1309 " dll= %d",1308 " module = %d", 1310 1309 $iRefcode); 1311 1310 $cFunctions = 0; … … 1321 1320 " file\n". 1322 1321 "WHERE\n". 1323 " dll= %d",1322 " module = %d", 1324 1323 $iRefcode); 1325 1324 $cFiles = 0; … … 1335 1334 " apigroup\n". 1336 1335 "WHERE\n". 1337 " dll= %d",1336 " module = %d", 1338 1337 $iRefcode); 1339 1338 $cAPIGroups = 0; … … 1351 1350 */ 1352 1351 Odin32DBNaslov("Completion", "completion"); 1353 Odin32DBCompletionBar Dll($iRefcode, "", $db);1352 Odin32DBCompletionBarModule($iRefcode, "", $db); 1354 1353 1355 1354 /* … … 1362 1361 " function\n". 1363 1362 "WHERE\n". 1364 " dll= %d\n".1363 " module = %d\n". 1365 1364 "GROUP BY state\n". 1366 1365 "ORDER BY state", … … 1383 1382 " LEFT JOIN state s ON f.state = s.refcode\n". 1384 1383 "WHERE\n". 1385 " f. dll= %d\n",1384 " f.module = %d\n", 1386 1385 $iRefcode); 1387 1386 if ($fSortByState) … … 1410 1409 " LEFT OUTER JOIN function fn ON fn.file = f.refcode\n". 1411 1410 "WHERE\n". 1412 " f. dll= %d\n".1411 " f.module = %d\n". 1413 1412 "GROUP BY f.refcode\n". 1414 1413 "ORDER BY f.name\n", … … 1437 1436 " JOIN function f\n". 1438 1437 "WHERE\n". 1439 " g. dll= %d AND\n".1440 " f. dll= %d AND\n".1438 " g.module = %d AND\n". 1439 " f.module = %d AND\n". 1441 1440 " f.apigroup = g.refcode\n". 1442 1441 "GROUP BY f.apigroup\n". … … 1467 1466 " JOIN author a\n". 1468 1467 "WHERE\n". 1469 " f. dll= %d AND\n".1468 " f.module = %d AND\n". 1470 1469 " fa.function = f.refcode AND\n". 1471 1470 " fa.author = a.refcode\n". … … 1535 1534 " f.revision AS revision,\n". 1536 1535 " f.description AS description,\n". 1537 " f. dll AS dllrefcode,\n".1538 " d.name AS dllname\n".1536 " f.module AS modrefcode,\n". 1537 " m.name AS modname\n". 1539 1538 "FROM\n". 1540 1539 " file f,\n". 1541 " dll d,\n".1540 " module m,\n". 1542 1541 " author a\n". 1543 1542 "WHERE\n". 1544 1543 " f.refcode = %d AND\n". 1545 " f. dll = d.refcode AND\n".1544 " f.module = m.refcode AND\n". 1546 1545 " f.lastauthor= a.refcode", 1547 1546 $iRefcode); … … 1554 1553 echo "\n<table width=100% border=3 cellpadding=0>\n"; 1555 1554 Odin32DBInfoRow1("Name", $array, "name","","","", 1556 " (<a href=\"cvs.phtml?sFile=./src/".$array[" dllname"]."/".$array["name"].",v&sRevision=\">cvs</a>)");1555 " (<a href=\"cvs.phtml?sFile=./src/".$array["modname"]."/".$array["name"].",v&sRevision=\">cvs</a>)"); 1557 1556 Odin32DBInfoRow1("Revision", $array, "revision","","","",""); 1558 1557 Odin32DBInfoRow1("Changed", $array, "lastdatetime","","","",""); 1559 1558 Odin32DBInfoRow1("Last Author", $array, "lastauthorname","lastauthorrefcode","authorrefcode","",""); 1560 Odin32DBInfoRow1(" Dll", $array, "dllname","dllrefcode","dllrefcode","","");1559 Odin32DBInfoRow1("Module", $array, "modname","modrefcode","modrefcode","",""); 1561 1560 $sql = sprintf("SELECT\n". 1562 1561 " COUNT(*) as functions\n". … … 1722 1721 * @param $db Database handle. 1723 1722 * @param $iRefcode Author reference code. 1724 * @param $f Dlls Flags which tells wether to list all dlls or not.1723 * @param $fModules Flags which tells wether to list all modules or not. 1725 1724 * @param $fFunctions Flags which tells wether to list all functions or not. 1726 1725 * @param $fFiles Flags which tells wether to list all files or not. … … 1728 1727 * @param $fSortByState Flags which tells wether to sort functions by 1729 1728 * state and function name or just by function name. 1730 * @param $i DllRefcode Dll refcode. All Dllif < 0.1729 * @param $iModRefcode Module refcode. All modules if < 0. 1731 1730 * (not implemented yet) 1732 1731 * @sketch … … 1734 1733 * @remark 1735 1734 */ 1736 function Odin32DBAuthorInfo($db, $iRefcode, $f Dlls, $fFunctions, $fFiles, $fAPIGroups, $fSortByState, $iDllRefcode)1735 function Odin32DBAuthorInfo($db, $iRefcode, $fModules, $fFunctions, $fFiles, $fAPIGroups, $fSortByState, $iModRefcode) 1737 1736 { 1738 1737 $sURLArgs = "authorrefcode=".$iRefcode. 1739 ($f Dlls ? "&fDlls=1" : "").1738 ($fModules ? "&fModules=1" : ""). 1740 1739 ($fFunctions ? "&fFunctions=1" : ""). 1741 1740 ($fFiles ? "&fFiles=1" : ""). … … 1746 1745 * Navigation - TOP 1747 1746 */ 1748 $sExpand = "authorrefcode=".$iRefcode."&f Dlls=1&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1&dll=".$iDllRefcode;1747 $sExpand = "authorrefcode=".$iRefcode."&fModules=1&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1&mod=".$iModRefcode; 1749 1748 if ($fSortByState) $sExpand = $sExpand."&fSortByState=".$fSortByState; 1750 1749 $sCollapse = "authorrefcode=".$iRefcode; … … 1796 1795 } 1797 1796 $sql = sprintf("SELECT\n". 1798 " COUNT(f. dll) as functions1797 " COUNT(f.module) as functions 1799 1798 \n". 1800 1799 "FROM\n". … … 1804 1803 " fa.author = %d AND". 1805 1804 " f.refcode = fa.function\n". 1806 "GROUP BY f. dll",1805 "GROUP BY f.module", 1807 1806 $iRefcode); 1808 $c Dlls = 0;1809 if (($result2 = mysql_query($sql, $db)) && ($c Dlls = mysql_num_rows($result2)) > 0)1810 Odin32DBInfoRow1NoArray("# Dlls", $cDlls, "","","","");1807 $cModules = 0; 1808 if (($result2 = mysql_query($sql, $db)) && ($cModules = mysql_num_rows($result2)) > 0) 1809 Odin32DBInfoRow1NoArray("# Moduless", $cModules, "","","",""); 1811 1810 $sql = sprintf("SELECT\n". 1812 " COUNT(f. dll) as functions1811 " COUNT(f.module) as functions 1813 1812 \n". 1814 1813 "FROM\n". … … 1825 1824 Odin32DBInfoRow1NoArray("# Files", $cFiles, "","","",""); 1826 1825 $sql = sprintf("SELECT\n". 1827 " COUNT(f. dll) as functions1826 " COUNT(f.module) as functions 1828 1827 \n". 1829 1828 "FROM\n". … … 1867 1866 1868 1867 /* 1869 * Dlls1870 */ 1871 Odin32DBNaslov(" Dlls", "dlls");1872 if ($f Dlls)1868 * Modules 1869 */ 1870 Odin32DBNaslov("Modules", "Modules"); 1871 if ($fModules) 1873 1872 { 1874 1873 $sql = sprintf("SELECT\n". 1875 " d.refcode,\n".1876 " d.name,\n".1874 " m.refcode,\n". 1875 " m.name,\n". 1877 1876 " COUNT(f.refcode)\n". 1878 1877 "FROM\n". 1879 1878 " fnauthor fa,\n". 1880 " dll d,\n".1879 " module m,\n". 1881 1880 " function f\n". 1882 1881 "WHERE\n". 1883 1882 " fa.author = %d AND\n". 1884 1883 " fa.function = f.refcode AND\n". 1885 " f. dll = d.refcode\n".1886 "GROUP BY d.refcode\n".1887 "ORDER BY d.name\n",1884 " f.module = m.refcode\n". 1885 "GROUP BY m.refcode\n". 1886 "ORDER BY m.name\n", 1888 1887 $iRefcode); 1889 Odin32DBWrite Dlls($sql, $db, $sURLArgs);1888 Odin32DBWriteModules($sql, $db, $sURLArgs); 1890 1889 } 1891 1890 else 1892 echo "Click <a href=\"Odin32DB.phtml# dlls?".$sURLArgs."&fDlls=1".1891 echo "Click <a href=\"Odin32DB.phtml#modules?".$sURLArgs."&fModules=1". 1893 1892 "\">here</a> to see all files.\n"; 1894 1893 … … 1903 1902 " f.refcode,\n". 1904 1903 " f.name,\n". 1905 " d.refcode,\n".1906 " d.name,\n".1904 " m.refcode,\n". 1905 " m.name,\n". 1907 1906 " s.color,\n". 1908 1907 " s.name\n". … … 1910 1909 " fnauthor fa\n". 1911 1910 " JOIN function f\n". 1912 " JOIN dll d\n".1911 " JOIN module m\n". 1913 1912 " LEFT JOIN state s ON f.state = s.refcode\n". 1914 1913 "WHERE\n". 1915 1914 " fa.author = %d AND\n". 1916 1915 " fa.function = f.refcode AND \n". 1917 " f. dll = d.refcode\n",1916 " f.module = m.refcode\n", 1918 1917 $iRefcode); 1919 1918 if ($fSortByState) … … 1921 1920 else 1922 1921 $sql = $sql."ORDER BY d.name, f.name"; 1923 Odin32DBWriteFunctionsWith Dlls($sql, $db, $sURLArgs);1922 Odin32DBWriteFunctionsWithModules($sql, $db, $sURLArgs); 1924 1923 } 1925 1924 else … … 2038 2037 " g.refcode AS refcode,\n". 2039 2038 " g.description AS description,\n". 2040 " d.name AS dllname,\n".2041 " d.refcode AS dllrefcode\n".2039 " m.name AS modname,\n". 2040 " m.refcode AS modrefcode\n". 2042 2041 "FROM\n". 2043 2042 " apigroup g\n". 2044 " JOIN dll d\n".2043 " JOIN module m\n". 2045 2044 "WHERE\n". 2046 2045 " g.refcode = %d AND". 2047 " g. dll = d.refcode\n",2046 " g.module = m.refcode\n", 2048 2047 $iRefcode); 2049 2048 if (($result = mysql_query($sql, $db)) && mysql_num_rows($result) > 0 && ($array = mysql_fetch_array($result))) … … 2055 2054 echo "\n<table width=100% border=3 cellpadding=0>\n"; 2056 2055 Odin32DBInfoRow1("Name", $array, "name","","","",""); 2057 Odin32DBInfoRow1(" Dll", $array, "dllname","dllrefcode","dllrefcode","bad configuration","");2056 Odin32DBInfoRow1("Module", $array, "modname","modrefcode","modrefcode","bad configuration",""); 2058 2057 if (isset($array["description"])) 2059 2058 Odin32DBInfoRow1("Description", $array, "description","","","",""); … … 2085 2084 2086 2085 $sql = sprintf("SELECT\n". 2087 " COUNT(f. dll) as functions\n".2086 " COUNT(f.module) as functions\n". 2088 2087 "FROM\n". 2089 2088 " fnauthor fa,\n". … … 2231 2230 * Navigation - TOP 2232 2231 */ 2233 $sExpand = "authorrefcode=".$iRefcode."&f Dlls=1&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1&dll=".$iDllRefcode;2232 $sExpand = "authorrefcode=".$iRefcode."&fModules=1&fFiles=1&fFunctions=1&fAPIGroups=1&fAuthors=1&module=".$iModRefcode; 2234 2233 if ($fSortByState) $sExpand = $sExpand."&fSortByState=".$fSortByState; 2235 2234 $sCollapse = "authorrefcode=".$iRefcode; … … 2243 2242 " dn.note AS note,\n". 2244 2243 " dn.refcode AS refcode,\n". 2245 " dn. dll AS dllrefcode,\n".2244 " dn.module AS modrefcode,\n". 2246 2245 " dn.file AS filerefcode,\n". 2247 2246 " dn.seqnbrnote AS seqnbnote,\n". … … 2249 2248 " dn.seqnbr AS seqnbr,\n". 2250 2249 " dn.line AS line,\n". 2251 " d.name AS dll,\n".2250 " m.name AS modname,\n". 2252 2251 " f.name AS file\n". 2253 2252 "FROM\n". 2254 2253 " designnote dn,\n". 2255 " dll d,\n".2254 " module m,\n". 2256 2255 " file f\n". 2257 2256 "WHERE dn.refcode = %d\n". 2258 " AND dn. dll = d.refcode\n".2257 " AND dn.module = m.refcode\n". 2259 2258 " AND dn.file = f.refcode\n". 2260 2259 "ORDER BY dn.seqnbrnote\n", … … 2268 2267 echo "\n<table width=100% border=3 cellpadding=0>\n"; 2269 2268 Odin32DBInfoRow1("Title", $array, "name","","","",""); 2270 Odin32DBInfoRow1("Module", $array, " dll","","","","");2269 Odin32DBInfoRow1("Module", $array, "modname","","","",""); 2271 2270 Odin32DBInfoRow1("File", $array, "file","","","",""); 2272 2271 Odin32DBInfoRow1("Line", $array, "line","","","","");
Note:
See TracChangeset
for help on using the changeset viewer.
