Menu
▾
▴
frontierkernel-commits — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(447) |
Nov
(163) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(172) |
Feb
|
Mar
(123) |
Apr
(64) |
May
(1) |
Jun
(278) |
Jul
(89) |
Aug
(97) |
Sep
(62) |
Oct
(53) |
Nov
(119) |
Dec
(60) |
| 2006 |
Jan
(76) |
Feb
(1094) |
Mar
(363) |
Apr
(163) |
May
(57) |
Jun
(43) |
Jul
(39) |
Aug
(15) |
Sep
(33) |
Oct
(62) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(9) |
Feb
(34) |
Mar
(2) |
Apr
(14) |
May
(8) |
Jun
(40) |
Jul
(21) |
Aug
(1) |
Sep
(20) |
Oct
(15) |
Nov
(26) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
|
Jul
|
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cre...@us...> - 2007-07-20 19:56:50
|
Revision: 1718
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1718&view=rev
Author: creecode
Date: 2007-07-20 12:56:53 -0700 (Fri, 20 Jul 2007)
Log Message:
-----------
adding mySql directory
Added Paths:
-----------
ODBs/trunk/docServerRoot/docServerData/formats/outline/mySql/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-20 19:51:38
|
Revision: 1717
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1717&view=rev
Author: creecode
Date: 2007-07-20 12:51:39 -0700 (Fri, 20 Jul 2007)
Log Message:
-----------
minor tweaks, tighten up language, references, no functional changes
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -1,34 +1,28 @@
FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.easyQuery
-on easyQuery ( databaseId, queryString, maxRows = 0 ) {
+on easyQuery ( databaseId, query, maxRows = 0 ) {
«Changes
+ «7/20/07; 12:38:56 PM by TAC
+ «changed method for checking if maxRows is a number
«6/2/07; 12:00:00 AM by DG
- «only get rows if compiledQuery is greater than zero
+ «only get rows if queryId is greater than zero
«5/29/07; 12:00:00 AM by DG
«created
- local ( compiledQuery, dataSet = { }, row, rowCount = 0 );
+ local ( queryId, dataSet = { }, row, rowCount = 0 );
- on isNum ( s ) {
- local ( ch, i );
-
- for i = 1 to string.length ( s ) {
- ch = string.mid ( s, i, 1 );
-
- if ( ch < '0' ) or ( ch > '9' ) {
- return ( false )}};
-
- return ( true )};
+ bundle { // is maxRow a number?
+ try {
+ number ( maxRows )}
+ else {
+ scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )}};
- if not ( isNum ( maxRows ) ) {
- scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )};
+ queryId = mySql.compileQuery ( databaseId, query ); // this will scriptError on its own if it fails
- compiledQuery = mySql.compileQuery ( databaseId, queryString ); // this will scriptError on its own if it fails
-
- if compiledQuery > 0 {
+ if queryId > 0 {
loop {
- result = mySql.getRow ( compiledQuery );
+ result = mySql.getRow ( queryId );
if result == 0 { // MySQL's code for no more rows
break};
@@ -40,7 +34,7 @@
dataSet [ rowCount ] = result};
- mySql.clearQuery ( compiledQuery )};
+ mySql.clearQuery ( queryId )};
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -4,21 +4,18 @@
«5/29/07; 12:00:00 AM by DG
«created
-local ( databaseId, databaseName = "States", password = "", port = 3306, queryId, result, server = "127.0.0.1", user = "root" );
+local ( databaseId, databaseName = "States", host = "127.0.0.1", password = "", port = 3306, query = "SELECT * FROM States", queryId, result, user = "root" );
result = mySql.init ( );
-databaseId = mySql.connect ( server, user, password, databaseName, port );
+databaseId = mySql.connect ( host, user, password, databaseName, port );
if mySql.getDatabaseNames ( databaseId ) contains "States" {
- queryId = mySql.compileQuery ( databaseId, "select * from States" );
+ queryId = mySql.compileQuery ( databaseId, query );
dialog.alert ( "Selected row count: " + mySql.getSelectedRowCount ( queryId ) );
-
dialog.alert ( "Column count: " + mySql.getColumnCount ( databaseId ) );
-
dialog.alert ( "Query warnings: " + mySql.getQueryWarningCount ( databaseId ) );
-
dialog.alert ( "Query info: " + mySql.getQueryInfo ( databaseId ) );
loop {
@@ -33,7 +30,7 @@
result = mySql.close ( databaseId );
- result = mysql.end ( );
+ result = mySql.end ( );
msg ( result )}
else {
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-11 05:28:22 UTC (rev 1716)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-20 19:51:39 UTC (rev 1717)
@@ -6,12 +6,12 @@
«5/29/07; 12:00:00 AM by DG
«created
- local ( compiledQuery, dataSet = { }, query = "SHOW tables", result, rowCount = 1, rowList );
+ local ( dataSet = { }, query = "SHOW tables", queryId, result, rowCount = 1, rowList );
- compiledQuery = mySql.compileQuery ( databaseId, query );
+ queryId = mySql.compileQuery ( databaseId, query );
loop {
- result = mySql.getRow ( compiledQuery );
+ result = mySql.getRow ( queryId );
if result == 0 {
break};
@@ -20,7 +20,7 @@
++rowCount};
- mySql.clearQuery ( compiledQuery );
+ mySql.clearQuery ( queryId );
return ( dataSet )}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-11 05:28:20
|
Revision: 1716
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1716&view=rev
Author: creecode
Date: 2007-07-10 22:28:22 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
in mysqlgetrowverb function, set type to novaluetype instead of NULL
Modified Paths:
--------------
Frontier/trunk/Common/source/langmysql.c
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2007-07-11 03:21:48 UTC (rev 1715)
+++ Frontier/trunk/Common/source/langmysql.c 2007-07-11 05:28:22 UTC (rev 1716)
@@ -718,11 +718,11 @@
default:
- type = NULL;
+ type = novaluetype;
} // switch
- if ( type != NULL )
+ if ( type != novaluetype )
if ( ! coercevalue ( &val, type ) )
goto error;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-11 03:21:49
|
Revision: 1715
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1715&view=rev
Author: creecode
Date: 2007-07-10 20:21:48 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
\p isn't going to fly on Windows for Pascal strings, back to the \x notation
Modified Paths:
--------------
Frontier/trunk/Common/source/langmysql.c
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2007-07-11 02:08:31 UTC (rev 1714)
+++ Frontier/trunk/Common/source/langmysql.c 2007-07-11 03:21:48 UTC (rev 1715)
@@ -351,7 +351,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pMySQL could not allocate a connection object." );
+ langerrormessage ( "\x2D" "MySQL could not allocate a connection object." );
return ( false );
@@ -361,7 +361,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pCould not connect to MySQL server." );
+ langerrormessage ( "\x22" "Could not connect to MySQL server." );
return ( false );
@@ -401,7 +401,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -455,7 +455,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -485,7 +485,7 @@
queryid = mysql_store_result(dbid);
if(mysql_errno(dbid) != 0) {
- langerrormessage ("\x21""Could initialize MySQL query.");
+ langerrormessage ("\x21""Could not initialize MySQL query.");
return (false);
}
@@ -529,6 +529,9 @@
boolean mysqlgetrowverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
//
+ // 2007-07-10 creedon: convert some numeric MYSQL_TYPE to numbers, see
+ // "Formats supported and returned as number"
+ //
// 2007-06-04 gewirtz: fix for returning TEXT type variant of BLOB
//
// 2007-05-31 creedon, asseily: fix for crash when column_text is NULL, return nil
@@ -578,18 +581,21 @@
MYSQL_TYPE_DECIMAL
MYSQL_TYPE_DOUBLE
MYSQL_TYPE_FLOAT
- MYSQL_TYPE_INT24
- MYSQL_TYPE_LONG
- MYSQL_TYPE_LONGLONG
MYSQL_TYPE_NEWDECIMAL
- MYSQL_TYPE_SHORT
MYSQL_TYPE_STRING
MYSQL_TYPE_TIME
MYSQL_TYPE_TIMESTAMP
- MYSQL_TYPE_TINY
MYSQL_TYPE_VAR_STRING
MYSQL_TYPE_YEAR
+ Formats supported and returned as number:
+
+ MYSQL_TYPE_INT24
+ MYSQL_TYPE_LONG
+ MYSQL_TYPE_LONGLONG
+ MYSQL_TYPE_SHORT
+ MYSQL_TYPE_TINY
+
More info: http://dev.mysql.com/doc/refman/5.1/en/c-api-datatypes.html
*/
@@ -684,6 +690,44 @@
if ( ! setheapvalue ( h, stringvaluetype, &val ) ) // convert handle to value
goto error;
+ bundle { // coerce certain numeric MYSQL_TYPE_ to kernel number types
+
+ tyvaluetype type;
+
+ switch ( field -> type ) {
+
+ case MYSQL_TYPE_LONG:
+ case MYSQL_TYPE_LONGLONG:
+
+ type = doublevaluetype;
+
+ break;
+
+ case MYSQL_TYPE_INT24:
+ case MYSQL_TYPE_SHORT:
+
+ type = longvaluetype;
+
+ break;
+
+ case MYSQL_TYPE_TINY:
+
+ type = intvaluetype;
+
+ break;
+
+ default:
+
+ type = NULL;
+
+ } // switch
+
+ if ( type != NULL )
+ if ( ! coercevalue ( &val, type ) )
+ goto error;
+
+ } // bundle
+
} // if
if (!langpushlistval (hlist, NULL, &val))
@@ -743,7 +787,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -795,7 +839,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -803,7 +847,7 @@
if ( mysql_ping ( dbid ) != 0 ) { // Check that server's still alive
- langerrormessage ( "\pLost connection to MySQL server." );
+ langerrormessage ( "\x20" "Lost connection to MySQL server." );
return ( false );
@@ -907,7 +951,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -970,7 +1014,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1027,7 +1071,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1079,7 +1123,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1146,7 +1190,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1210,7 +1254,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1286,7 +1330,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1340,7 +1384,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1401,7 +1445,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1453,7 +1497,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1544,7 +1588,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1611,7 +1655,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
@@ -1668,7 +1712,7 @@
if ( dbid == NULL ) {
- langerrormessage ( "\pInvalid MySQL database connection ID." );
+ langerrormessage ( "\x25" "Invalid MySQL database connection ID." );
return ( false );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-11 02:08:33
|
Revision: 1714
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1714&view=rev
Author: creecode
Date: 2007-07-10 19:08:31 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
renamed 'Most populous city?' field to Most_populous_city?, consistent with other fields
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc 2007-07-10 19:54:16 UTC (rev 1713)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc 2007-07-11 02:08:31 UTC (rev 1714)
@@ -1,20 +1,23 @@
FrontierVcsFile:3:TEXT:system.verbs.builtins.mySql.data.["States.sql"]
-- data obtained from < http://en.wikipedia.org/wiki/List_of_capitals_in_the_United_States >
+
+-- MySQL dump 10.11
--
--- MySQL dump 10.9
---
-- Host: localhost Database: States
-- ------------------------------------------------------
--- Server version 4.1.9-standard-log
+-- Server version 5.0.37
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `States`
@@ -26,7 +29,7 @@
`Date_of_statehood` smallint(6) unsigned NOT NULL default '0',
`Capital` varchar(32) NOT NULL default '',
`Capital_since` smallint(6) unsigned NOT NULL default '0',
- `Most populous city?` enum('Yes','No') NOT NULL default 'No',
+ `Most_populous_city?` enum('Yes','No') NOT NULL default 'No',
`Population` mediumint(8) unsigned NOT NULL default '0',
`Notes_on_current_capital` tinytext NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -35,12 +38,12 @@
-- Dumping data for table `States`
--
-
+LOCK TABLES `States` WRITE;
/*!40000 ALTER TABLE `States` DISABLE KEYS */;
-LOCK TABLES `States` WRITE;
INSERT INTO `States` VALUES ('Alabama',1819,'Montgomery',1846,'No',200127,''),('Alaska',1959,'Juneau',1906,'No',30987,''),('Arizona',1912,'Phoenix',1889,'No',1475834,''),('Arkansas',1836,'Little Rock',1836,'No',184564,''),('California',1850,'Sacramento',1854,'No',467343,''),('Colorado',1876,'Denver',1867,'No',566974,'Denver City served as the capital of the Colorado Territory 1861-1862 and 1867-1876.'),('Connecticut',1776,'Hartford',1875,'No',124397,'Hartford also served as the capital 1639-1686 and 1689-1700, and as the co-capital with New Haven 1701-1875.'),('Delaware',1776,'Dover',1777,'No',32135,''),('Florida',1845,'Tallahassee',1824,'No',156612,''),('Georgia',1776,'Atlanta',1868,'No',483108,''),('Hawaii',1959,'Honolulu',1845,'No',371657,''),('Idaho',1890,'Boise',1865,'No',216248,''),('Illinois',1818,'Springfield',1839,'No',111454,''),('Indiana',1816,'Indianapolis',1825,'No',791926,''),('Iowa',1846,'Des Moines',1857,'No',194163,''),('Kansas',1861,'Topeka',1856,'No',122327,''),('Kentucky',1792,'Frankfort',1792,'No',27741,''),('Louisiana',1812,'Baton Rouge',1880,'No',224097,'Baton Rouge also served as the capital 1849-1862.'),('Maine',1820,'Augusta',1832,'No',18560,'Augusta was officially capital from 1827 but the legislature did not sit there until 1832.'),('Maryland',1776,'Annapolis',1694,'No',36217,''),('Massachusetts',1776,'Boston',1630,'No',596368,''),('Michigan',1837,'Lansing',1847,'No',119128,'Lansing is the only state capital that is not also the county seat of the county in which it is situated.'),('Minnesota',1858,'Saint Paul',1849,'No',287151,''),('Mississippi',1817,'Jackson',1821,'No',184256,''),('Missouri',1821,'Jefferson City',1826,'No',39636,''),('Montana',1889,'Helena',1889,'No',25780,''),('Nebraska',1867,'Lincoln',1867,'No',225581,''),('Nevada',1864,'Carson City',1861,'No',57701,''),('New Hampshire',1776,'Concord',1808,'No',42221,''),('New Jersey',1776,'Trenton',1784,'No',84639,''),('New Mexico',1912,'Santa Fe',1610,'No',70631,'El Paso del Norte served as the capital of the Santa Fé de Nuevo Méjico colony-in-exile during the Pueblo Revolt of 1680-1692.'),('New York',1776,'Albany',1797,'No',95993,''),('North Carolina',1776,'Raleigh',1794,'No',359332,''),('North Dakota',1889,'Bismarck',1883,'No',55532,''),('Ohio',1803,'Columbus',1816,'No',730657,''),('Oklahoma',1907,'Oklahoma City',1910,'No',541500,''),('Oregon',1859,'Salem',1855,'No',149305,'Salem first served as the capital in 1851, but Corvallis was briefly the capital in 1855.'),('Pennsylvania',1776,'Harrisburg',1812,'No',48950,''),('Rhode Island',1776,'Providence',1900,'No',176862,'Providence also served as the capital 1636-1686 and 1689-1776. It was one of five co-capitals 1776-1853, and one of two co-capitals 1853-1900.'),('South Carolina',1776,'Columbia',1786,'No',122819,''),('South Dakota',1889,'Pierre',1889,'No',13876,''),('Tennessee',1796,'Nashville',1826,'No',607413,'Nashville also served as the capital 1812-1818.'),('Texas',1845,'Austin',1839,'No',690252,''),('Utah',1896,'Salt Lake City',1858,'No',181743,''),('Vermont',1791,'Montpelier',1805,'No',8035,''),('Virginia',1776,'Richmond',1780,'No',195251,''),('Washington',1889,'Olympia',1853,'No',42514,''),('West Virginia',1863,'Charleston',1885,'No',52700,'Charleston also served as the capital 1870-1875.'),('Wisconsin',1848,'Madison',1838,'No',221551,''),('Wyoming',1890,'Cheyenne',1869,'No',55362,'');
+/*!40000 ALTER TABLE `States` ENABLE KEYS */;
UNLOCK TABLES;
-/*!40000 ALTER TABLE `States` ENABLE KEYS */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -48,7 +51,9 @@
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2007-07-11 1:49:51
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-10 20:40:10
|
Revision: 1713
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1713&view=rev
Author: creecode
Date: 2007-07-10 12:54:16 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
in functions with dbid, if NULL script error
formatting tweaks
Modified Paths:
--------------
Frontier/trunk/Common/source/langmysql.c
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2007-07-10 17:50:56 UTC (rev 1712)
+++ Frontier/trunk/Common/source/langmysql.c 2007-07-10 19:54:16 UTC (rev 1713)
@@ -42,11 +42,11 @@
#include "oplist.h"
#include "langsystem7.h"
-#ifdef WIN95VERSION
+// #ifdef WIN95VERSION
- #include "my_global.h"
+// #include "my_global.h"
-#endif // WIN95VERSION
+// #endif // WIN95VERSION
#include "mysql.h"
#include "langmysql.h"
@@ -98,110 +98,147 @@
} tymysqlverbtoken;
-static boolean mysqlfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+static boolean mysqlfunctionvalue ( short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
+
+ //
+ // 2007-04-11 gewirtz: created
+ //
hdltreenode hp1 = hparam1;
tyvaluerecord *v = vreturned;
- setbooleanvalue (false, v); /* by default, sqlite functions return false */
+ setbooleanvalue ( false, v ); // by default, sqlite functions return false
- switch (token) {
+ switch ( token ) {
- case initfunc: { /* 2007-04-08 gewirtz: initialize MySQL */
- return (mysqlinitverb (hp1, v, bserror));
- } /* initfunc */
- case endfunc: { /* 2007-04-08 gewirtz: initialize MySQL */
- return (mysqlendverb (hp1, v, bserror));
- } /* endfunc */
- case connectfunc: { /* 2007-04-08 gewirtz: initialize MySQL */
- return (mysqlconnectverb (hp1, v, bserror));
- } /* connectfunc */
- case compilequeryfunc: { /* 2007-04-09 gewirtz: prepare a MySQL query */
- return (mysqlcompilequeryverb (hp1, v, bserror));
- } /* compilequeryfunc */
- case clearqueryfunc: { /* 2007-04-09 gewirtz: clear a MySQL query from memory */
- return (mysqlclearqueryverb (hp1, v, bserror));
- } /* clearqueryfunc */
- case getrowfunc: { /* 2007-04-09 gewirtz: get a full row from a query */
- return (mysqlgetrowverb (hp1, v, bserror));
- } /* getrowfunc */
- case geterrornumberfunc: { /* 2007-04-10 gewirtz: get the error number from the most recent call */
- return (mysqlgeterrornumberverb (hp1, v, bserror));
- } /* geterrornumberfunc */
- case geterrormessagefunc: { /* 2007-04-10 gewirtz: get the error message from the most recent call */
- return (mysqlgeterrormessageverb (hp1, v, bserror));
- } /* geterrormessagefunc */
- case getclientinfofunc: { /* 2007-04-10 gewirtz: get the MySQL client info */
- return (mysqlgetclientinfoverb (hp1, v, bserror));
- } /* getclientinfofunc */
- case getclientversionfunc: { /* 2007-04-10 gewirtz: get the MySQL client version */
- return (mysqlgetclientversionverb (hp1, v, bserror));
- } /* getclientversionfunc */
- case gethostinfofunc: { /* 2007-04-10 gewirtz: get the MySQL host info */
- return (mysqlgethostinfoverb (hp1, v, bserror));
- } /* gethostinfofunc */
- case getserverversionfunc: { /* 2007-04-10 gewirtz: get the MySQL server version */
- return (mysqlgetserverversionverb (hp1, v, bserror));
- } /* getserverversionfunc */
- case getprotocolinfofunc: { /* 2007-04-10 gewirtz: get the MySQL protocol info */
- return (mysqlgetprotocolinfoverb (hp1, v, bserror));
- } /* getprotocolinfofunc */
- case getserverinfofunc: { /* 2007-04-10 gewirtz: get the MySQL server info */
- return (mysqlgetserverinfoverb (hp1, v, bserror));
- } /* getserverinfofunc */
- case getqueryinfofunc: { /* 2007-04-10 gewirtz: get the results messages from the last query */
- return (mysqlgetqueryinfoverb (hp1, v, bserror));
- } /* getqueryinfofunc */
- case getaffectedrowcountfunc: { /* 2007-04-11 gewirtz: get the rows added, deleted, updated */
- return (mysqlgetaffectedrowcountverb (hp1, v, bserror));
- } /* getaffectedrowcountfunc */
- case getselectedrowcountfunc: { /* 2007-04-11 gewirtz: get the rows selected in last query */
- return (mysqlgetselectedrowcountverb (hp1, v, bserror));
- } /* getselectedrowcountfunc */
- case getcolumncountfunc: { /* 2007-04-11 gewirtz: get the columns returned in last query */
- return (mysqlgetcolumncountverb (hp1, v, bserror));
- } /* getcolumncountfunc */
- case getserverstatusfunc: { /* 2007-04-11 gewirtz: get the MySQL server status */
- return (mysqlgetserverstatusverb (hp1, v, bserror));
- } /* getserverstatusfunc */
- case getquerywarningcountfunc: { /* 2007-04-11 gewirtz: get the number of warnings returned by the last query */
- return (mysqlgetquerywarningcountverb (hp1, v, bserror));
- } /* getquerywarningcountfunc */
- case pingserverfunc: { /* 2007-04-11 gewirtz: check to see if there's still a connection with the server */
- return (mysqlpingserververb (hp1, v, bserror));
- } /* pingserverfunc */
- case seekrowfunc: { /* 2007-04-11 gewirtz: move to specific row in query result set */
- return (mysqlseekrowverb (hp1, v, bserror));
- } /* seekrowfunc */
- case selectdatabasefunc: { /* 2007-04-11 gewirtz: choose a MySQL database as current */
- return (mysqlselectdatabaseverb (hp1, v, bserror));
- } /* selectdatabasefunc */
- case getsqlstatefunc: { /* 2007-04-11 gewirtz: choose a MySQL database as current */
- return (mysqlgetsqlstateverb (hp1, v, bserror));
- } /* getsqlstatefunc */
- case escapestringfunc: { /* 2007-04-11 gewirtz: choose a MySQL database as current */
- return (mysqlescapestringverb (hp1, v, bserror));
- } /* escapestringfunc */
- case isthreadsafefunc: { /* 2007-04-11 gewirtz: choose a MySQL database as current */
- return (mysqlisthreadsafeverb (hp1, v, bserror));
- } /* isthreadsafefunc */
- case closefunc: { /* 2007-04-08 gewirtz: close a MySQL db */
- return (mysqlcloseverb (hp1, v, bserror));
- } /* closefunc */
+ case initfunc: // initialize MySQL
+
+ return ( mysqlinitverb ( hp1, v, bserror ) );
+
+ case endfunc:
+
+ return ( mysqlendverb ( hp1, v, bserror ) );
+
+ case connectfunc:
+
+ return ( mysqlconnectverb ( hp1, v, bserror ) );
+
+ case compilequeryfunc: // prepare a MySQL query
+
+ return ( mysqlcompilequeryverb ( hp1, v, bserror ) );
+
+ case clearqueryfunc: // clear a MySQL query from memory
+
+ return ( mysqlclearqueryverb ( hp1, v, bserror ) );
+
+ case getrowfunc: // get a full row from a query
+
+ return ( mysqlgetrowverb ( hp1, v, bserror ) );
+
+ case geterrornumberfunc: // get the error number from the most recent call
+
+ return ( mysqlgeterrornumberverb ( hp1, v, bserror ) );
+
+ case geterrormessagefunc: // get the error message from the most recent call
+
+ return ( mysqlgeterrormessageverb ( hp1, v, bserror ) );
+
+ case getclientinfofunc: // get the MySQL client info
+
+ return ( mysqlgetclientinfoverb ( hp1, v, bserror ) );
+
+ case getclientversionfunc: // get the MySQL client version
+
+ return ( mysqlgetclientversionverb ( hp1, v, bserror ) );
+
+ case gethostinfofunc: // get the MySQL host info
+
+ return ( mysqlgethostinfoverb ( hp1, v, bserror ) );
+
+ case getserverversionfunc: // get the MySQL server version
+
+ return ( mysqlgetserverversionverb ( hp1, v, bserror ) );
+
+ case getprotocolinfofunc: // get the MySQL protocol info
+
+ return ( mysqlgetprotocolinfoverb ( hp1, v, bserror ) );
+
+ case getserverinfofunc: // get the MySQL server info
+
+ return ( mysqlgetserverinfoverb ( hp1, v, bserror ) );
+
+ case getqueryinfofunc: // get the results messages from the last query
+
+ return ( mysqlgetqueryinfoverb ( hp1, v, bserror ) );
+
+ case getaffectedrowcountfunc: // get the rows added, deleted, updated
+
+ return ( mysqlgetaffectedrowcountverb ( hp1, v, bserror ) );
+
+ case getselectedrowcountfunc: // get the rows selected in last query
+
+ return ( mysqlgetselectedrowcountverb ( hp1, v, bserror ) );
+
+ case getcolumncountfunc: // get the columns returned in last query
+
+ return ( mysqlgetcolumncountverb ( hp1, v, bserror ) );
+
+ case getserverstatusfunc: // get the MySQL server status
+
+ return ( mysqlgetserverstatusverb ( hp1, v, bserror ) );
+
+ case getquerywarningcountfunc: // get the number of warnings returned by the last query
+
+ return ( mysqlgetquerywarningcountverb ( hp1, v, bserror ) );
+
+ case pingserverfunc: // check to see if there's still a connection with the server
+
+ return ( mysqlpingserververb ( hp1, v, bserror ) );
+
+ case seekrowfunc: // move to specific row in query result set
+
+ return ( mysqlseekrowverb ( hp1, v, bserror ) );
+
+ case selectdatabasefunc: // choose a MySQL database as current
+
+ return ( mysqlselectdatabaseverb ( hp1, v, bserror ) );
+
+ case getsqlstatefunc:
+
+ return ( mysqlgetsqlstateverb ( hp1, v, bserror ) );
+
+ case escapestringfunc:
+
+ return ( mysqlescapestringverb ( hp1, v, bserror ) );
+
+ case isthreadsafefunc:
+
+ return ( mysqlisthreadsafeverb ( hp1, v, bserror ) );
+
+ case closefunc: // close a MySQL db
+
+ return ( mysqlcloseverb ( hp1, v, bserror ) );
+
default:
- getstringlist (langerrorlist, unimplementedverberror, bserror);
- return (false);
- } /* switch */
- } /* mysqlfunctionvalue */
+
+ getstringlist ( langerrorlist, unimplementedverberror, bserror );
+
+ return ( false );
+
+ } // switch
+
+ } // mysqlfunctionvalue
boolean mysqlinitverbs (void) {
return (loadfunctionprocessor (idmysqlverbs, &mysqlfunctionvalue));
+
} /* mysqlinitverbs */
boolean mysqlinitverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
+
int resultCode;
static char *server_args[] = {
"this_program" // this string is not used
@@ -250,25 +287,22 @@
return(setbooleanvalue (true, vreturned));
-} // mysqlendverb
+ } // mysqlendverb
boolean mysqlconnectverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
- MYSQL *dbid; // the MySQL object handle
- Handle host; // hostname of the MySQL server
- Handle user; // valid username on the MySQL server
- Handle passwd; // password for user on MySQL server
- Handle dbname; // existing database on MySQL server
- long port; // TCP/IP port for the connection
-
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.connect (host, user, password, database, port)
- Action: connects to a MySQL server and database, initializing the mySQL connection object
- Params: the hostname, user id, password, existing database name, and port
- Returns: a MySQL object handle or an error
- Usage: call in a try statement
+ Action: connects to a MySQL server and database, initializing the mySQL connection object
+ Params: the hostname, user id, password, existing database name, and port
+ Returns: a MySQL object handle or an error
+ Usage: call in a try statement
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-init.html
http://dev.mysql.com/doc/refman/5.1/en/mysql-real-connect.html
@@ -277,51 +311,75 @@
http://dev.mysql.com/doc/refman/5.1/en/can-not-connect-to-server.html#can-not-connect-to-server-on-windows
*/
- if (!gettextvalue (hparam1, 1, &host)) // get the host param
- return (false);
+ MYSQL *dbid; // the MySQL object handle
+ Handle host; // hostname of the MySQL server
+ Handle user; // valid username on the MySQL server
+ Handle passwd; // password for user on MySQL server
+ Handle dbname; // existing database on MySQL server
+ long port; // TCP/IP port for the connection
- if (!gettextvalue (hparam1, 2, &user)) // get the user param
- return (false);
+ if ( ! gettextvalue ( hparam1, 1, &host ) ) // get the host param
+ return ( false );
- if (!gettextvalue (hparam1, 3, &passwd)) // get the passwd param
- return (false);
+ if ( ! gettextvalue ( hparam1, 2, &user ) ) // get the user param
+ return ( false );
- if (!gettextvalue (hparam1, 4, &dbname)) // get the dbname param
- return (false);
+ if ( ! gettextvalue ( hparam1, 3, &passwd ) ) // get the passwd param
+ return ( false );
- flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
+ if ( ! gettextvalue ( hparam1, 4, &dbname ) ) // get the dbname param
+ return ( false );
- if (!getlongvalue (hparam1, 5, &port)) // get the port param
- return (false);
+ flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
- // Null terminate strings
- if (!pushcharhandle (0x00, host)) return (false);
- if (!pushcharhandle (0x00, user)) return (false);
- if (!pushcharhandle (0x00, passwd)) return (false);
- if (!pushcharhandle (0x00, dbname)) return (false);
+ if ( ! getlongvalue ( hparam1, 5, &port ) ) // get the port param
+ return ( false );
- // Initialize the MySQL object
- dbid = mysql_init((MYSQL*) 0);
- if (dbid == NULL) {
- langerrormessage ("\x2D""MySQL could not allocate a connection object.");
- return (false);
- }
- // Attempt the connection
- dbid = mysql_real_connect(dbid, *host, *user, *passwd, *dbname, (unsigned int) port, NULL, 0 );
- if (dbid == NULL) {
- langerrormessage ("\x22""Could not connect to MySQL server.");
- return (false);
- }
+ if ( ! pushcharhandle ( 0x00, host ) ) // Null terminate strings
+ return ( false );
+
+ if ( ! pushcharhandle ( 0x00, user ) )
+ return ( false );
+
+ if ( ! pushcharhandle ( 0x00, passwd ) )
+ return ( false );
+
+ if ( ! pushcharhandle ( 0x00, dbname ) )
+ return ( false );
+
+ dbid = mysql_init ( ( MYSQL* ) 0 ); // Initialize the MySQL object
- return (setlongvalue ((long) dbid, vreturned));
+ if ( dbid == NULL ) {
-} // mysqlconnectverb
+ langerrormessage ( "\pMySQL could not allocate a connection object." );
+
+ return ( false );
+
+ }
+
+ dbid = mysql_real_connect ( dbid, *host, *user, *passwd, *dbname, ( unsigned int ) port, NULL, 0 ); // Attempt the connection
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pCould not connect to MySQL server." );
+
+ return ( false );
+
+ }
+
+ return ( setlongvalue ( ( long ) dbid, vreturned ) );
+
+ } // mysqlconnectverb
boolean mysqlcloseverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- int returnCode; // return code from close call
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.close(dbid)
@@ -333,11 +391,22 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-close.html
*/
+ MYSQL *dbid; // the MySQL object handle
+ int returnCode; // return code from close call
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -350,15 +419,17 @@
return setlongvalue (returnCode, vreturned);
-} /* mysqlcloseverb */
+ } /* mysqlcloseverb */
boolean mysqlcompilequeryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- Handle query; // the SQL query passed to the MySQL server
- MYSQL *dbid; // the MySQL object handle
- MYSQL_RES *queryid; // the returned MySQL query id
- int returnCode; // return code from MySQL query
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.compileQuery(dbid, query)
@@ -373,10 +444,23 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-query.html
http://dev.mysql.com/doc/refman/5.1/en/mysql-store-result.html
*/
-
+
+ Handle query; // the SQL query passed to the MySQL server
+ MYSQL *dbid; // the MySQL object handle
+ MYSQL_RES *queryid; // the returned MySQL query id
+ int returnCode; // return code from MySQL query
+
if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
if (!gettextvalue (hparam1, 2, &query)) // get the query param
@@ -409,10 +493,12 @@
return (setlongvalue ((long) 0, vreturned)); // return 0 to the scripter
else
return (setlongvalue ((long) queryid, vreturned)); // return the db address to the scripter
-} /* mysqlcompilequeryverb */
+
+ } /* mysqlcompilequeryverb */
boolean mysqlclearqueryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
MYSQL_RES *queryid; // the returned MySQL query id
int returnCode;
@@ -437,14 +523,16 @@
returnCode = 0; // placeholder. mysql_free_result doesn't return anything.
return setlongvalue (returnCode, vreturned);
-} /* mysqlclearqueryverb */
+ } /* mysqlclearqueryverb */
boolean mysqlgetrowverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
//
// 2007-06-04 gewirtz: fix for returning TEXT type variant of BLOB
+ //
// 2007-05-31 creedon, asseily: fix for crash when column_text is NULL, return nil
+ //
// 2007-05-29 gewirtz: created
//
@@ -476,76 +564,81 @@
The only formats we explicitly don't support are:
- MYSQL_TYPE_BIT
- MYSQL_TYPE_BLOB (although we do return TEXT, which is a BLOB variant)
- MYSQL_TYPE_SET
- MYSQL_TYPE_ENUM
- MYSQL_TYPE_GEOMETRY
- MYSQL_TYPE_NULL
-
+ MYSQL_TYPE_BIT
+ MYSQL_TYPE_BLOB (although we do return TEXT, which is a BLOB variant)
+ MYSQL_TYPE_ENUM
+ MYSQL_TYPE_GEOMETRY
+ MYSQL_TYPE_NULL
+ MYSQL_TYPE_SET
+
Formats supported and returned as string:
- MYSQL_TYPE_TINY
- MYSQL_TYPE_SHORT
- MYSQL_TYPE_LONG
- MYSQL_TYPE_INT24
- MYSQL_TYPE_LONGLONG
- MYSQL_TYPE_DECIMAL
- MYSQL_TYPE_NEWDECIMAL
- MYSQL_TYPE_FLOAT
- MYSQL_TYPE_DOUBLE
- MYSQL_TYPE_TIMESTAMP
- MYSQL_TYPE_DATE
- MYSQL_TYPE_TIME
- MYSQL_TYPE_DATETIME
- MYSQL_TYPE_YEAR
- MYSQL_TYPE_STRING
- MYSQL_TYPE_VAR_STRING
-
+ MYSQL_TYPE_DATE
+ MYSQL_TYPE_DATETIME
+ MYSQL_TYPE_DECIMAL
+ MYSQL_TYPE_DOUBLE
+ MYSQL_TYPE_FLOAT
+ MYSQL_TYPE_INT24
+ MYSQL_TYPE_LONG
+ MYSQL_TYPE_LONGLONG
+ MYSQL_TYPE_NEWDECIMAL
+ MYSQL_TYPE_SHORT
+ MYSQL_TYPE_STRING
+ MYSQL_TYPE_TIME
+ MYSQL_TYPE_TIMESTAMP
+ MYSQL_TYPE_TINY
+ MYSQL_TYPE_VAR_STRING
+ MYSQL_TYPE_YEAR
+
More info: http://dev.mysql.com/doc/refman/5.1/en/c-api-datatypes.html
*/
- unsigned int fieldNumber; /* field number */
- unsigned int fieldCount; /* number of fields */
- MYSQL_RES *queryid; /* query id */
+ unsigned int fieldNumber; // field number
+ unsigned int fieldCount; // number of fields
+ MYSQL_RES *queryid; // query id
MYSQL_ROW row;
MYSQL_FIELD *field;
hdllistrecord hlist;
- Handle returnH;
+ Handle h = NULL;
const unsigned char *column_text;
tyvaluerecord val;
-
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
+
+ flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
+
+ if (!getlongvalue (hparam1, 1, (long *) &queryid)) // Get the long value, which becomes the queryid pointer
return (false);
-
+
row = mysql_fetch_row(queryid);
+
if (row == NULL) {
// return 0, meaning no more rows
// **** NOTE THIS COULD ALSO MEAN AN ERROR, MIGHT BE GOOD TO CHECK
return (setlongvalue ((long) 0, vreturned));
- }
-
+
+ }
+
fieldCount = mysql_num_fields(queryid);
-
+
if (fieldCount == 0) {
- langerrormessage ("\x2D""MySQL.getRow requires a minimum of one field.");
+
+ langerrormessage ("\x2D""MySQL.getRow requires a minimum of one field.");
+
return (false);
- }
-
+
+ }
+
mysql_field_seek(queryid, 0); // restart gathering field data from the first field
-
+
if (!opnewlist (&hlist, false)) // fail out if we can't create the list
return (false);
-
+
for (fieldNumber=0; fieldNumber<fieldCount; ++fieldNumber) {
-
+
field = mysql_fetch_field(queryid);
-
- switch(field->type) {
+
+ switch ( field->type ) {
+
case MYSQL_TYPE_TINY:
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_LONG:
@@ -562,17 +655,19 @@
case MYSQL_TYPE_YEAR:
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_BLOB:
- {
+ case MYSQL_TYPE_BLOB: {
+
if (field->type == MYSQL_TYPE_BLOB) {
// This is a special case, to see if the type is really TEXT
if (field->charsetnr == 63) {
// binary data, see http://dev.mysql.com/doc/refman/5.0/en/c-api-datatypes.html
if (!langpushlistlong (hlist, (long) 0))
goto error;
+
return (setheapvalue ((Handle) hlist, listvaluetype, vreturned));
}
}
+
column_text = row[fieldNumber];
if ( column_text == NULL )
@@ -582,38 +677,51 @@
else {
// Exit the verb, converting column_name back to Frontier handle
- if (!newfilledhandle ((ptrvoid) column_text, strlen (column_text), &returnH))
- return false; /* Allocation failed */
- if (!setheapvalue (returnH, stringvaluetype, &val)) // convert handle to value
+
+ if ( ! newfilledhandle ( ( ptrvoid ) column_text, strlen ( column_text ), &h ) )
+ return ( false ); // Allocation failed
+
+ if ( ! setheapvalue ( h, stringvaluetype, &val ) ) // convert handle to value
goto error;
- }
+ } // if
- if (!langpushlistval (hlist, nil, &val))
+ if (!langpushlistval (hlist, NULL, &val))
goto error;
+
break;
- }
+
+ }
+
default: {
+
if (!langpushlistlong (hlist, (long) 0))
goto error;
- }
- } /* switch */
- } /* for */
+ }
+
+ } // switch
+
+ } // for
return (setheapvalue ((Handle) hlist, listvaluetype, vreturned));
- error: {
- opdisposelist (hlist);
- return (false);
- }
+ error:
+
+ opdisposelist ( hlist );
+
+ return ( false );
-} /* mysqlgetrow */
+ } // mysqlgetrow
boolean mysqlgeterrornumberverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned int returnCode; // return code from MySQL call
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getErrorNumber(dbid)
@@ -625,11 +733,22 @@
http://dev.mysql.com/doc/refman/5.1/en/errors-handling.html
*/
+ MYSQL *dbid; // the MySQL object handle
+ unsigned int returnCode; // return code from MySQL call
+
flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the pline pointer */
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -641,14 +760,19 @@
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgeterrornumberverb */
+ } /* mysqlgeterrornumberverb */
-boolean mysqlgeterrormessageverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlError; // pointer to the error message
- Handle returnH = nil; // The handle being returned back to Frontier
+boolean mysqlgeterrormessageverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // formatting tweaks
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getErrorMessage(dbid)
@@ -657,35 +781,50 @@
Returns: a string containing the error message
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-error.html
- http://dev.mysql.com/doc/refman/5.1/en/errors-handling.html
+ http://dev.mysql.com/doc/refman/5.1/en/errors-handling.html
*/
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
- return (false);
-
- // Check that server's still alive
- if (mysql_ping(dbid) != 0) {
- langerrormessage ("\x20""Lost connection to MySQL server.");
- return (false);
- }
-
- // Process the MySQL sequence
- mysqlError = mysql_error(dbid);
-
+
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlError; // pointer to the error message
+ Handle h = NULL; // The handle being returned back to Frontier
+
+ flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
+
+ if ( ! getlongvalue ( hparam1, 1, ( long * ) &dbid ) ) // Get the long value, which becomes the db pointer
+ return ( false );
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
+ if ( mysql_ping ( dbid ) != 0 ) { // Check that server's still alive
+
+ langerrormessage ( "\pLost connection to MySQL server." );
+
+ return ( false );
+
+ }
+
+ mysqlError = mysql_error ( dbid ); // Process the MySQL sequence
+
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlError, strlen (mysqlError), &returnH))
- return false; // Allocation failed
+
+ if ( ! newfilledhandle ( ( ptrvoid ) mysqlError, strlen ( mysqlError ), &h ) )
+ return ( false ); // Allocation failed
+
+ return ( setheapvalue ( h, stringvaluetype, vreturned ) );
+
+ } // mysqlgeterrormessageverb
- return (setheapvalue (returnH, stringvaluetype, vreturned));
-} /* mysqlgeterrormessageverb */
+boolean mysqlgetclientinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
-
-boolean mysqlgetclientinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
const char *mysqlMsg; // pointer to the message
- Handle returnH = nil; // The handle being returned back to Frontier
+ Handle h = nil; // The handle being returned back to Frontier
/*
mysql.getClientInfo()
@@ -701,15 +840,16 @@
mysqlMsg = mysql_get_client_info();
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &h))
return false; // Allocation failed
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgetclientinfoverb */
+ } /* mysqlgetclientinfoverb */
boolean mysqlgetclientversionverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
unsigned long returnCode; // The number being returned back to Frontier
@@ -735,14 +875,17 @@
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgetclientversionverb */
+ } /* mysqlgetclientversionverb */
boolean mysqlgethostinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlMsg; // pointer to the message
- Handle returnH = nil; // The handle being returned back to Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getHostInfo(dbid)
@@ -753,11 +896,23 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-get-host-info.html
*/
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlMsg; // pointer to the message
+ Handle h = nil; // The handle being returned back to Frontier
+
flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -768,19 +923,22 @@
mysqlMsg = mysql_get_host_info(dbid);
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &h))
return false; // Allocation failed
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgethostinfoverb */
+ } /* mysqlgethostinfoverb */
boolean mysqlgetserverversionverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned long returnCode; // the return code
-
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getServerVersion(dbid)
@@ -801,12 +959,23 @@
programs for quickly determining whether some version-specific
server capability exists.
*/
-
+
+ MYSQL *dbid; // the MySQL object handle
+ unsigned long returnCode; // the return code
+
flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -819,14 +988,17 @@
// Exit the verb, converting errMsg back to Frontier handle
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgetserverversionverb */
+ } /* mysqlgetserverversionverb */
boolean mysqlgetprotocolinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned int returnCode; // the return code
-
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getProtocolInfo(dbid)
@@ -844,12 +1016,23 @@
http://www.redferni.uklinux.net/mysql/MySQL-Protocol.html
*/
-
+
+ MYSQL *dbid; // the MySQL object handle
+ unsigned int returnCode; // the return code
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -862,15 +1045,17 @@
// Exit the verb, converting errMsg back to Frontier handle
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgetprotocolinfoverb */
+ } /* mysqlgetprotocolinfoverb */
boolean mysqlgetserverinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlMsg; // pointer to the message
- Handle returnH = nil; // The handle being returned back to Frontier
-
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getServerInfo(dbid)
@@ -882,12 +1067,24 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-get-server-info.html
*/
-
+
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlMsg; // pointer to the message
+ Handle h = nil; // The handle being returned back to Frontier
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -898,19 +1095,22 @@
mysqlMsg = mysql_get_server_info(dbid);
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &h))
return false; // Allocation failed
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgetserverinfoverb */
+ } /* mysqlgetserverinfoverb */
boolean mysqlgetqueryinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlMsg; // pointer to the message
- Handle returnH = nil; // The handle being returned back to Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getQueryInfo(dbid)
@@ -934,12 +1134,24 @@
For all other, the routine returns ""
*/
-
+
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlMsg; // pointer to the message
+ Handle h = nil; // The handle being returned back to Frontier
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -951,23 +1163,27 @@
if (mysqlMsg == NULL) {
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) "", 0, &returnH))
+ if(!newfilledhandle ((ptrvoid) "", 0, &h))
return false; // Allocation failed
} else {
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlMsg, strlen (mysqlMsg), &h))
return false; // Allocation failed
}
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgetqueryinfoverb */
+ } /* mysqlgetqueryinfoverb */
boolean mysqlgetaffectedrowcountverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- my_ulonglong rowCount; // this datastructure is too big for Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getAffectedRowCount(dbid)
@@ -984,11 +1200,22 @@
*/
+ MYSQL *dbid; // the MySQL object handle
+ my_ulonglong rowCount; // this datastructure is too big for Frontier
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -1000,10 +1227,11 @@
return (setdoublevalue ((double) rowCount, vreturned));
-} /* mysqlgetaffectedrowcountverb */
+ } /* mysqlgetaffectedrowcountverb */
boolean mysqlgetselectedrowcountverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
MYSQL_RES *queryid; // query id
my_ulonglong rowCount; // this datastructure is too big for Frontier
@@ -1027,13 +1255,17 @@
return (setdoublevalue ((double) rowCount, vreturned));
-} /* mysqlgetselectedrowcountverb */
+ } /* mysqlgetselectedrowcountverb */
boolean mysqlgetcolumncountverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned int returnCode; // return code from MySQL call
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getColumnCount(dbid)
@@ -1044,11 +1276,22 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-field-count.html
*/
+ MYSQL *dbid; // the MySQL object handle
+ unsigned int returnCode; // return code from MySQL call
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the pline pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -1060,14 +1303,17 @@
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgetcolumncountverb */
+ } /* mysqlgetcolumncountverb */
boolean mysqlgetserverstatusverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlStatus; // pointer to the status message
- Handle returnH = nil; // The handle being returned back to Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getServerStatus(dbid)
@@ -1082,12 +1328,24 @@
Status will fail/crash if mysql.connect() hasn't previously succeeded. It'll
be messy, so check your result codes.
*/
-
+
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlStatus; // pointer to the status message
+ Handle h = nil; // The handle being returned back to Frontier
+
flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -1102,19 +1360,23 @@
}
else {
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlStatus, strlen (mysqlStatus), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlStatus, strlen (mysqlStatus), &h))
return false; // Allocation failed
}
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgetserverstatusverb */
+ } /* mysqlgetserverstatusverb */
boolean mysqlgetquerywarningcountverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned int returnCode; // return code from MySQL call
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getQueryWarningCount(dbid)
@@ -1129,11 +1391,22 @@
Obviously, you should check this when performing queries.
*/
+ MYSQL *dbid; // the MySQL object handle
+ unsigned int returnCode; // return code from MySQL call
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the pline pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -1145,13 +1418,17 @@
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlgetquerywarningcountverb */
+ } /* mysqlgetquerywarningcountverb */
boolean mysqlpingserververb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- unsigned int returnCode; // return code from MySQL call
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.pingServer(dbid)
@@ -1166,20 +1443,32 @@
mysql.pingServer() attempts to reconnect if the connection went down.
*/
+ MYSQL *dbid; // the MySQL object handle
+ unsigned int returnCode; // return code from MySQL call
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
-
+
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the pline pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Process the MySQL call
returnCode = mysql_ping(dbid);
return (setlongvalue ((long) returnCode, vreturned));
-} /* mysqlpingserververb */
+ } /* mysqlpingserververb */
boolean mysqlseekrowverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
MYSQL_RES *queryid; // the returned MySQL query id
tyvaluerecord v1;
double row; // row to seek
@@ -1225,15 +1514,17 @@
return (setlongvalue ((long) 0, vreturned));
-} /* mysqlseekrowverb */
+ } /* mysqlseekrowverb */
boolean mysqlselectdatabaseverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
- MYSQL *dbid; // the MySQL object handle
- int resultCode; // result code
- Handle dbname; // existing database on MySQL server
-
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.selectDatabase(dbid, database)
@@ -1244,9 +1535,21 @@
MySQL docs: http://dev.mysql.com/doc/refman/5.1/en/mysql-select-db.html
*/
+ MYSQL *dbid; // the MySQL object handle
+ int resultCode; // result code
+ Handle dbname; // existing database on MySQL server
+
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!gettextvalue (hparam1, 2, &dbname)) // get the dbname param
@@ -1271,14 +1574,17 @@
return (setlongvalue ((long) 0, vreturned));
-} /* mysqlselectdatabaseverb */
+ } /* mysqlselectdatabaseverb */
boolean mysqlgetsqlstateverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- const char *mysqlStatus; // pointer to the status message
- Handle returnH = nil; // The handle being returned back to Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.getSQLState(dbid)
@@ -1294,11 +1600,23 @@
so lucky?
*/
+ MYSQL *dbid; // the MySQL object handle
+ const char *mysqlStatus; // pointer to the status message
+ Handle h = nil; // The handle being returned back to Frontier
+
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the db pointer
return (false);
-
+
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
// Check that server's still alive
if (mysql_ping(dbid) != 0) {
langerrormessage ("\x20""Lost connection to MySQL server.");
@@ -1309,22 +1627,22 @@
mysqlStatus = mysql_sqlstate(dbid);
// Exit the verb, converting errMsg back to Frontier handle
- if(!newfilledhandle ((ptrvoid) mysqlStatus, strlen (mysqlStatus), &returnH))
+ if(!newfilledhandle ((ptrvoid) mysqlStatus, strlen (mysqlStatus), &h))
return false; // Allocation failed
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlgetsqlstateverb */
+ } /* mysqlgetsqlstateverb */
boolean mysqlescapestringverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
- Handle fromstring;
- Handle tostring;
- unsigned long size;
- unsigned long encodedSize;
- Handle returnH = nil; // The handle being returned back to Frontier
+ //
+ // 2007-07-02 creedon: if dbid is NULL script error
+ //
+ // 2007-05-29 gewirtz: created
+ //
+
/*
mysql.escapeString(dbid, string)
@@ -1338,9 +1656,24 @@
use by the server
*/
+ MYSQL *dbid; // the MySQL object handle
+ Handle fromstring;
+ Handle tostring;
+ unsigned long size;
+ unsigned long encodedSize;
+ Handle h = nil; // The handle being returned back to Frontier
+
if (!getlongvalue (hparam1, 1, (long *) &dbid)) // Get the long value, which becomes the pline pointer
return (false);
+ if ( dbid == NULL ) {
+
+ langerrormessage ( "\pInvalid MySQL database connection ID." );
+
+ return ( false );
+
+ }
+
flnextparamislast = true; // makes sure Frontier throws an error
if (!gettextvalue (hparam1, 2, &fromstring)) // get the from param
@@ -1359,18 +1692,19 @@
encodedSize = mysql_real_escape_string(dbid, *tostring, *fromstring, size);
// Exit the verb, converting the allocated string back to Frontier handle
- if(!newfilledhandle ((ptrvoid) *tostring, encodedSize, &returnH)) {
+ if(!newfilledhandle ((ptrvoid) *tostring, encodedSize, &h)) {
return false; // Allocation failed
}
disposehandle(tostring);
- return (setheapvalue (returnH, stringvaluetype, vreturned));
+ return (setheapvalue (h, stringvaluetype, vreturned));
-} /* mysqlescapestringverb */
+ } /* mysqlescapestringverb */
boolean mysqlisthreadsafeverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
unsigned long returnCode; // The number being returned back to Frontier
/*
@@ -1396,5 +1730,5 @@
else
return(setbooleanvalue (false, vreturned));
-} /* mysqlisthreadsafeverb */
+ } /* mysqlisthreadsafeverb */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-10 17:50:56
|
Revision: 1712
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1712&view=rev
Author: creecode
Date: 2007-07-10 10:50:56 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
-fno-short-enums compiler flag to langmysql.c, bug fix for mysqlgetrowverb always returning MYSQL_TYPE_DECIMAL for field type
Modified Paths:
--------------
Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
Modified: Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2007-07-10 17:50:33 UTC (rev 1711)
+++ Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj 2007-07-10 17:50:56 UTC (rev 1712)
@@ -78,7 +78,7 @@
5D8F1E170C25AFC600927B97 /* typelib.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8F1E100C25AFC500927B97 /* typelib.h */; };
5D8F1EF00C25B4AB00927B97 /* libmysqlclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D8F1EEE0C25B4AB00927B97 /* libmysqlclient.a */; };
5D8F1EF10C25B4AB00927B97 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D8F1EEF0C25B4AB00927B97 /* libz.a */; };
- 5D8F1EF40C25B51A00927B97 /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D8F1EF30C25B51A00927B97 /* langmysql.c */; };
+ 5D8F1EF40C25B51A00927B97 /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D8F1EF30C25B51A00927B97 /* langmysql.c */; settings = {COMPILER_FLAGS = "-fno-short-enums"; }; };
5D8F1EF70C25B56600927B97 /* langmysql.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8F1EF60C25B56600927B97 /* langmysql.h */; };
5DCA3B0C0AF552C700D6155D /* libpaigefat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCA3B0B0AF552C700D6155D /* libpaigefat.a */; };
5DCA3B0D0AF552C700D6155D /* libpaigefat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCA3B0B0AF552C700D6155D /* libpaigefat.a */; };
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-10 17:50:31
|
Revision: 1711
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1711&view=rev
Author: creecode
Date: 2007-07-10 10:50:33 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
-fno-short-enums compiler flag to langmysql.c, bug fix for mysqlgetrowverb always returning MYSQL_TYPE_DECIMAL for field type
Modified Paths:
--------------
Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
Modified: Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
===================================================================
--- Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2007-07-03 03:14:34 UTC (rev 1710)
+++ Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj 2007-07-10 17:50:33 UTC (rev 1711)
@@ -70,7 +70,7 @@
5D4832630C17729E009E897D /* mysql.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D4832620C17729E009E897D /* mysql.h */; };
5D4E1E490AAA17E900DF6890 /* langsqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D4E1E470AAA17E900DF6890 /* langsqlite.c */; };
5D4E1E4A0AAA17E900DF6890 /* langsqlite.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D4E1E480AAA17E900DF6890 /* langsqlite.h */; };
- 5D5837F10C0E02FA00DB769C /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D5837F00C0E02FA00DB769C /* langmysql.c */; };
+ 5D5837F10C0E02FA00DB769C /* langmysql.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D5837F00C0E02FA00DB769C /* langmysql.c */; settings = {COMPILER_FLAGS = "-fno-short-enums"; }; };
5D5837F30C0E035D00DB769C /* langmysql.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D5837F20C0E035D00DB769C /* langmysql.h */; };
5D8F017F0C247FE700927B97 /* libmysqlclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D8F017D0C247FE700927B97 /* libmysqlclient.a */; };
5D8F01800C247FE700927B97 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D8F017E0C247FE700927B97 /* libz.a */; };
@@ -4166,7 +4166,7 @@
"OPMLEDITOR=1",
);
GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
+ GCC_SHORT_ENUMS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = YES;
@@ -4223,7 +4223,7 @@
GCC_PREFIX_HEADER = frontier.xcode.h;
GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
+ GCC_SHORT_ENUMS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = YES;
@@ -4280,7 +4280,7 @@
"OPMLEDITOR=1",
);
GCC_REUSE_STRINGS = NO;
- GCC_SHORT_ENUMS = YES;
+ GCC_SHORT_ENUMS = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = YES;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-03 03:14:34
|
Revision: 1710
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1710&view=rev
Author: creecode
Date: 2007-07-02 20:14:34 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
replaced item with dump from mysqldump command line tool instead of CocoaMySQL
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc 2007-07-03 02:46:10 UTC (rev 1709)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc 2007-07-03 03:14:34 UTC (rev 1710)
@@ -1,19 +1,26 @@
FrontierVcsFile:3:TEXT:system.verbs.builtins.mySql.data.["States.sql"]
-# data obtained from < http://en.wikipedia.org/wiki/List_of_capitals_in_the_United_States >
+-- data obtained from < http://en.wikipedia.org/wiki/List_of_capitals_in_the_United_States >
+--
+-- MySQL dump 10.9
+--
+-- Host: localhost Database: States
+-- ------------------------------------------------------
+-- Server version 4.1.9-standard-log
-# CocoaMySQL dump
-# Version 0.5
-# http://cocoamysql.sourceforge.net
-#
-# Host: localhost (MySQL 4.1.9-standard-log)
-# Database: States
-# Generation Time: 2007-07-02 01:25:01 -0700
-# ************************************************************
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
-# Dump of table States
-# ------------------------------------------------------------
+--
+-- Table structure for table `States`
+--
+DROP TABLE IF EXISTS `States`;
CREATE TABLE `States` (
`State` varchar(32) NOT NULL default '',
`Date_of_statehood` smallint(6) unsigned NOT NULL default '0',
@@ -24,58 +31,24 @@
`Notes_on_current_capital` tinytext NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Alabama","1819","Montgomery","1846","No","200127","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Alaska","1959","Juneau","1906","No","30987","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Arizona","1912","Phoenix","1889","No","1475834","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Arkansas","1836","Little Rock","1836","No","184564","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("California","1850","Sacramento","1854","No","467343","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Colorado","1876","Denver","1867","No","566974","Denver City served as the capital of the Colorado Territory 1861-1862 and 1867-1876.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Connecticut","1776","Hartford","1875","No","124397","Hartford also served as the capital 1639-1686 and 1689-1700, and as the co-capital with New Haven 1701-1875.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Delaware","1776","Dover","1777","No","32135","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Florida","1845","Tallahassee","1824","No","156612","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Georgia","1776","Atlanta","1868","No","483108","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Hawaii","1959","Honolulu","1845","No","371657","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Idaho","1890","Boise","1865","No","216248","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Illinois","1818","Springfield","1839","No","111454","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Indiana","1816","Indianapolis","1825","No","791926","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Iowa","1846","Des Moines","1857","No","194163","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Kansas","1861","Topeka","1856","No","122327","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Kentucky","1792","Frankfort","1792","No","27741","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Louisiana","1812","Baton Rouge","1880","No","224097","Baton Rouge also served as the capital 1849-1862.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Maine","1820","Augusta","1832","No","18560","Augusta was officially capital from 1827 but the legislature did not sit there until 1832.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Maryland","1776","Annapolis","1694","No","36217","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Massachusetts","1776","Boston","1630","No","596368","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Michigan","1837","Lansing","1847","No","119128","Lansing is the only state capital that is not also the county seat of the county in which it is situated.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Minnesota","1858","Saint Paul","1849","No","287151","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Mississippi","1817","Jackson","1821","No","184256","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Missouri","1821","Jefferson City","1826","No","39636","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Montana","1889","Helena","1889","No","25780","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Nebraska","1867","Lincoln","1867","No","225581","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Nevada","1864","Carson City","1861","No","57701","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Hampshire","1776","Concord","1808","No","42221","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Jersey","1776","Trenton","1784","No","84639","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Mexico","1912","Santa Fe","1610","No","70631","El Paso del Norte served as the capital of the Santa Fé de Nuevo Méjico colony-in-exile during the Pueblo Revolt of 1680-1692.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New York","1776","Albany","1797","No","95993","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("North Carolina","1776","Raleigh","1794","No","359332","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("North Dakota","1889","Bismarck","1883","No","55532","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Ohio","1803","Columbus","1816","No","730657","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Oklahoma","1907","Oklahoma City","1910","No","541500","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Oregon","1859","Salem","1855","No","149305","Salem first served as the capital in 1851, but Corvallis was briefly the capital in 1855.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Pennsylvania","1776","Harrisburg","1812","No","48950","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Rhode Island","1776","Providence","1900","No","176862","Providence also served as the capital 1636-1686 and 1689-1776. It was one of five co-capitals 1776-1853, and one of two co-capitals 1853-1900.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("South Carolina","1776","Columbia","1786","No","122819","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("South Dakota","1889","Pierre","1889","No","13876","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Tennessee","1796","Nashville","1826","No","607413","Nashville also served as the capital 1812-1818.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Texas","1845","Austin","1839","No","690252","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Utah","1896","Salt Lake City","1858","No","181743","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Vermont","1791","Montpelier","1805","No","8035","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Virginia","1776","Richmond","1780","No","195251","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Washington","1889","Olympia","1853","No","42514","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("West Virginia","1863","Charleston","1885","No","52700","Charleston also served as the capital 1870-1875.");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Wisconsin","1848","Madison","1838","No","221551","");
-INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Wyoming","1890","Cheyenne","1869","No","55362","");
+--
+-- Dumping data for table `States`
+--
+/*!40000 ALTER TABLE `States` DISABLE KEYS */;
+LOCK TABLES `States` WRITE;
+INSERT INTO `States` VALUES ('Alabama',1819,'Montgomery',1846,'No',200127,''),('Alaska',1959,'Juneau',1906,'No',30987,''),('Arizona',1912,'Phoenix',1889,'No',1475834,''),('Arkansas',1836,'Little Rock',1836,'No',184564,''),('California',1850,'Sacramento',1854,'No',467343,''),('Colorado',1876,'Denver',1867,'No',566974,'Denver City served as the capital of the Colorado Territory 1861-1862 and 1867-1876.'),('Connecticut',1776,'Hartford',1875,'No',124397,'Hartford also served as the capital 1639-1686 and 1689-1700, and as the co-capital with New Haven 1701-1875.'),('Delaware',1776,'Dover',1777,'No',32135,''),('Florida',1845,'Tallahassee',1824,'No',156612,''),('Georgia',1776,'Atlanta',1868,'No',483108,''),('Hawaii',1959,'Honolulu',1845,'No',371657,''),('Idaho',1890,'Boise',1865,'No',216248,''),('Illinois',1818,'Springfield',1839,'No',111454,''),('Indiana',1816,'Indianapolis',1825,'No',791926,''),('Iowa',1846,'Des Moines',1857,'No',194163,''),('Kansas',1861,'Topeka',1856,'No',122327,''),('Kentucky',1792,'Frankfort',1792,'No',27741,''),('Louisiana',1812,'Baton Rouge',1880,'No',224097,'Baton Rouge also served as the capital 1849-1862.'),('Maine',1820,'Augusta',1832,'No',18560,'Augusta was officially capital from 1827 but the legislature did not sit there until 1832.'),('Maryland',1776,'Annapolis',1694,'No',36217,''),('Massachusetts',1776,'Boston',1630,'No',596368,''),('Michigan',1837,'Lansing',1847,'No',119128,'Lansing is the only state capital that is not also the county seat of the county in which it is situated.'),('Minnesota',1858,'Saint Paul',1849,'No',287151,''),('Mississippi',1817,'Jackson',1821,'No',184256,''),('Missouri',1821,'Jefferson City',1826,'No',39636,''),('Montana',1889,'Helena',1889,'No',25780,''),('Nebraska',1867,'Lincoln',1867,'No',225581,''),('Nevada',1864,'Carson City',1861,'No',57701,''),('New Hampshire',1776,'Concord',1808,'No',42221,''),('New Jersey',1776,'Trenton',1784,'No',84639,''),('New Mexico',1912,'Santa Fe',1610,'No',70631,'El Paso del Norte served as the capital of the Santa Fé de Nuevo Méjico colony-in-exile during the Pueblo Revolt of 1680-1692.'),('New York',1776,'Albany',1797,'No',95993,''),('North Carolina',1776,'Raleigh',1794,'No',359332,''),('North Dakota',1889,'Bismarck',1883,'No',55532,''),('Ohio',1803,'Columbus',1816,'No',730657,''),('Oklahoma',1907,'Oklahoma City',1910,'No',541500,''),('Oregon',1859,'Salem',1855,'No',149305,'Salem first served as the capital in 1851, but Corvallis was briefly the capital in 1855.'),('Pennsylvania',1776,'Harrisburg',1812,'No',48950,''),('Rhode Island',1776,'Providence',1900,'No',176862,'Providence also served as the capital 1636-1686 and 1689-1776. It was one of five co-capitals 1776-1853, and one of two co-capitals 1853-1900.'),('South Carolina',1776,'Columbia',1786,'No',122819,''),('South Dakota',1889,'Pierre',1889,'No',13876,''),('Tennessee',1796,'Nashville',1826,'No',607413,'Nashville also served as the capital 1812-1818.'),('Texas',1845,'Austin',1839,'No',690252,''),('Utah',1896,'Salt Lake City',1858,'No',181743,''),('Vermont',1791,'Montpelier',1805,'No',8035,''),('Virginia',1776,'Richmond',1780,'No',195251,''),('Washington',1889,'Olympia',1853,'No',42514,''),('West Virginia',1863,'Charleston',1885,'No',52700,'Charleston also served as the capital 1870-1875.'),('Wisconsin',1848,'Madison',1838,'No',221551,''),('Wyoming',1890,'Cheyenne',1869,'No',55362,'');
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `States` ENABLE KEYS */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-03 02:46:09
|
Revision: 1709
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1709&view=rev
Author: creecode
Date: 2007-07-02 19:46:10 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
adding data and examples directories to mySql directory
Added Paths:
-----------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/exportMySqlDump.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/importMySqlDump.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/connect.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/getNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/init.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/pingTest.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/selectDatabase.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/threadSafe.fvc
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,81 @@
+FrontierVcsFile:3:TEXT:system.verbs.builtins.mySql.data.["States.sql"]
+
+# data obtained from < http://en.wikipedia.org/wiki/List_of_capitals_in_the_United_States >
+
+# CocoaMySQL dump
+# Version 0.5
+# http://cocoamysql.sourceforge.net
+#
+# Host: localhost (MySQL 4.1.9-standard-log)
+# Database: States
+# Generation Time: 2007-07-02 01:25:01 -0700
+# ************************************************************
+
+# Dump of table States
+# ------------------------------------------------------------
+
+CREATE TABLE `States` (
+ `State` varchar(32) NOT NULL default '',
+ `Date_of_statehood` smallint(6) unsigned NOT NULL default '0',
+ `Capital` varchar(32) NOT NULL default '',
+ `Capital_since` smallint(6) unsigned NOT NULL default '0',
+ `Most populous city?` enum('Yes','No') NOT NULL default 'No',
+ `Population` mediumint(8) unsigned NOT NULL default '0',
+ `Notes_on_current_capital` tinytext NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Alabama","1819","Montgomery","1846","No","200127","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Alaska","1959","Juneau","1906","No","30987","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Arizona","1912","Phoenix","1889","No","1475834","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Arkansas","1836","Little Rock","1836","No","184564","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("California","1850","Sacramento","1854","No","467343","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Colorado","1876","Denver","1867","No","566974","Denver City served as the capital of the Colorado Territory 1861-1862 and 1867-1876.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Connecticut","1776","Hartford","1875","No","124397","Hartford also served as the capital 1639-1686 and 1689-1700, and as the co-capital with New Haven 1701-1875.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Delaware","1776","Dover","1777","No","32135","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Florida","1845","Tallahassee","1824","No","156612","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Georgia","1776","Atlanta","1868","No","483108","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Hawaii","1959","Honolulu","1845","No","371657","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Idaho","1890","Boise","1865","No","216248","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Illinois","1818","Springfield","1839","No","111454","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Indiana","1816","Indianapolis","1825","No","791926","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Iowa","1846","Des Moines","1857","No","194163","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Kansas","1861","Topeka","1856","No","122327","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Kentucky","1792","Frankfort","1792","No","27741","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Louisiana","1812","Baton Rouge","1880","No","224097","Baton Rouge also served as the capital 1849-1862.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Maine","1820","Augusta","1832","No","18560","Augusta was officially capital from 1827 but the legislature did not sit there until 1832.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Maryland","1776","Annapolis","1694","No","36217","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Massachusetts","1776","Boston","1630","No","596368","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Michigan","1837","Lansing","1847","No","119128","Lansing is the only state capital that is not also the county seat of the county in which it is situated.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Minnesota","1858","Saint Paul","1849","No","287151","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Mississippi","1817","Jackson","1821","No","184256","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Missouri","1821","Jefferson City","1826","No","39636","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Montana","1889","Helena","1889","No","25780","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Nebraska","1867","Lincoln","1867","No","225581","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Nevada","1864","Carson City","1861","No","57701","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Hampshire","1776","Concord","1808","No","42221","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Jersey","1776","Trenton","1784","No","84639","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New Mexico","1912","Santa Fe","1610","No","70631","El Paso del Norte served as the capital of the Santa Fé de Nuevo Méjico colony-in-exile during the Pueblo Revolt of 1680-1692.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("New York","1776","Albany","1797","No","95993","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("North Carolina","1776","Raleigh","1794","No","359332","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("North Dakota","1889","Bismarck","1883","No","55532","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Ohio","1803","Columbus","1816","No","730657","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Oklahoma","1907","Oklahoma City","1910","No","541500","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Oregon","1859","Salem","1855","No","149305","Salem first served as the capital in 1851, but Corvallis was briefly the capital in 1855.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Pennsylvania","1776","Harrisburg","1812","No","48950","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Rhode Island","1776","Providence","1900","No","176862","Providence also served as the capital 1636-1686 and 1689-1776. It was one of five co-capitals 1776-1853, and one of two co-capitals 1853-1900.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("South Carolina","1776","Columbia","1786","No","122819","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("South Dakota","1889","Pierre","1889","No","13876","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Tennessee","1796","Nashville","1826","No","607413","Nashville also served as the capital 1812-1818.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Texas","1845","Austin","1839","No","690252","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Utah","1896","Salt Lake City","1858","No","181743","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Vermont","1791","Montpelier","1805","No","8035","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Virginia","1776","Richmond","1780","No","195251","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Washington","1889","Olympia","1853","No","42514","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("West Virginia","1863","Charleston","1885","No","52700","Charleston also served as the capital 1870-1875.");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Wisconsin","1848","Madison","1838","No","221551","");
+INSERT INTO `States` (`State`,`Date_of_statehood`,`Capital`,`Capital_since`,`Most populous city?`,`Population`,`Notes_on_current_capital`) VALUES ("Wyoming","1890","Cheyenne","1869","No","55362","");
+
+
+
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/States2Esql.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/exportMySqlDump.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/exportMySqlDump.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/exportMySqlDump.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,15 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.data.utilities.exportMySqlDump
+
+«Changes
+ «7/2/07; 7:23:11 PM by TAC
+ «created
+
+local ( item = table.getCursor ( ) );
+local ( f = nameOf ( item^ ) );
+
+if file.putFileDialog ( "", @f ) {
+ local ( s = string.replaceAll ( item^, cr, lf ) );
+
+ file.writeWholeFile ( f, s )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/exportMySqlDump.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/importMySqlDump.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/importMySqlDump.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/importMySqlDump.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,16 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.data.utilities.importMySqlDump
+
+«Changes
+ «7/2/07; 7:23:11 PM by TAC
+ «created
+
+local ( f );
+
+if file.getFileDialog ( "", @f, 0 ) {
+ local ( s = file.readWholeFile ( f ) );
+
+ s = string.replaceAll ( s, lf, cr );
+
+ mySql.data.[ file.fileFromPath ( f ) ] = s}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/data/utilities/importMySqlDump.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/connect.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/connect.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/connect.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,31 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.connect
+
+on connect ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ local ( databaseId, databaseName = "States", password = "", port = 3306, result, server = "127.0.0.1", user = "root" );
+
+ try {
+ databaseId = mySql.connect ( server, user, password, databaseName, port )}
+ else {
+
+ dialog.alert ( mySql.getErrorMessage ( databaseId ) );
+ dialog.alert ( mySql.getErrorNumber ( databaseId ) )};
+
+ result = mySql.close ( databaseId );
+
+ return ( result )};
+
+local ( i );
+
+mySql.init ( );
+
+for i = 1 to 1000000 {
+ msg ( i + ": " + connect ( ) + " (" + sys.memavail ( ) + ")" )};
+
+mySql.end ( )
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/connect.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/getNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/getNames.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/getNames.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,37 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.getNames
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+local ( databaseId, databaseName = "States", password = "", port = 3306, result, server = "127.0.0.1", names, user = "root" );
+
+mySql.init ( );
+
+try {
+ databaseId = mySql.connect ( server, user, password, databaseName, port )}
+else {
+ dialog.alert ( mySql.getErrorMessage ( databaseId ) )};
+
+names = mySql.getDatabaseNames ( databaseId );
+
+dialog.alert ( names );
+
+if names contains "States" {
+ names = mySql.getTableNames ( databaseId );
+
+ dialog.alert ( names );
+
+ names = mySql.getFieldNames ( databaseId, "States" );
+
+ dialog.alert ( names );
+
+ result = mySql.close ( databaseId );
+
+ mySql.end ( );
+
+ msg ( result )}
+else {
+ scriptError ( "Please install the States table (mySql.examples.data.[ \"States.sql\" ]) in a States database on your MySQL server." )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/getNames.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/init.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/init.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/init.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,14 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.init
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+try {
+ mySql.init ( );
+
+ dialog.alert ( "MySQL initialized." )}
+else {
+ dialog.alert ( tryError )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/init.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/pingTest.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/pingTest.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/pingTest.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,31 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.pingTest
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+local ( databaseId, databaseName = "States", password = "", port = 3306, server = "127.0.0.1", user = "root" );
+
+mySql.init ( );
+
+dialog.alert ( "Testing server. Be sure it's on." );
+
+databaseId = mySql.connect ( server, user, password, databaseName, port );
+
+dialog.alert ( "Server ping: " + mySql.pingServer ( databaseId ) );
+
+dialog.alert ( "Now, turn server off for a moment. Click OK when server is off." );
+
+dialog.alert ( "Server ping: " + mySql.pingServer ( databaseId ) );
+
+dialog.alert ( "Now, turn back on. Click OK when server is on." );
+
+dialog.alert ( "Server ping: " + mySql.pingServer ( databaseId ) );
+
+dialog.alert ( "Server ping: " + mySql.pingServer ( databaseId ) );
+
+mySql.close ( databaseId );
+
+mySql.end ( )
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/pingTest.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,42 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.query
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+local ( databaseId, databaseName = "States", password = "", port = 3306, queryId, result, server = "127.0.0.1", user = "root" );
+
+result = mySql.init ( );
+
+databaseId = mySql.connect ( server, user, password, databaseName, port );
+
+if mySql.getDatabaseNames ( databaseId ) contains "States" {
+ queryId = mySql.compileQuery ( databaseId, "select * from States" );
+
+ dialog.alert ( "Selected row count: " + mySql.getSelectedRowCount ( queryId ) );
+
+ dialog.alert ( "Column count: " + mySql.getColumnCount ( databaseId ) );
+
+ dialog.alert ( "Query warnings: " + mySql.getQueryWarningCount ( databaseId ) );
+
+ dialog.alert ( "Query info: " + mySql.getQueryInfo ( databaseId ) );
+
+ loop {
+ result = mySql.getRow ( queryId );
+
+ if result == 0 {
+ break};
+
+ dialog.alert ( result )};
+
+ mySql.clearQuery ( queryId );
+
+ result = mySql.close ( databaseId );
+
+ result = mysql.end ( );
+
+ msg ( result )}
+else {
+ scriptError ( "Please install the States table (mySql.examples.data.[ \"States.sql\" ]) in a States database on your MySQL server." )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/query.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/selectDatabase.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/selectDatabase.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/selectDatabase.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,47 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.selectDatabase
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+local ( databaseId, databaseName = "States", password = "", port = 3306, result, server = "127.0.0.1", names, user = "root" );
+
+mySql.init ( );
+
+try {
+ databaseId = mySql.connect ( server, user, password, databaseName, port )}
+else {
+ dialog.alert ( mySql.getErrorMessage ( databaseId ) );
+
+ return ( false )};
+
+names = mySql.getDatabaseNames ( databaseId );
+
+dialog.alert ( names );
+
+names = mySql.getTableNames ( databaseId );
+
+dialog.alert ( names );
+
+try {
+ mySql.selectDatabase ( databaseId, "mysql" )}
+else {
+ dialog.alert ( mySql.getErrorMessage ( databaseId ) );
+
+ result = mySql.close ( databaseId );
+
+ mySql.end ( );
+
+ return ( false )};
+
+names = mySql.getTableNames ( databaseId );
+
+dialog.alert ( names );
+
+result = mySql.close ( databaseId );
+
+mySql.end ( );
+
+msg ( result )
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/selectDatabase.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/threadSafe.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/threadSafe.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/threadSafe.fvc 2007-07-03 02:46:10 UTC (rev 1709)
@@ -0,0 +1,12 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.examples.threadSafe
+
+«Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+if not ( mySql.isThreadSafe ( ) ) {
+ dialog.alert ( "Library is NOT thread-safe." )}
+else {
+ dialog.alert ( "Library compiled to be thread-safe." )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/examples/threadSafe.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-02 09:40:43
|
Revision: 1708
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1708&view=rev
Author: creecode
Date: 2007-07-02 02:40:45 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
mySql verbs, changed mysql to mySql
Modified Paths:
--------------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.clearQuery )}
+ kernel ( mySql.clearQuery )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.close )}
+ kernel ( mySql.close )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.compileQuery )}
+ kernel ( mySql.compileQuery )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.connect )}
+ kernel ( mySql.connect )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -22,13 +22,13 @@
return ( true )};
if not ( isNum ( maxRows ) ) {
- scriptError ( "mysql.easyQuery requires a numeric value for maxRows." )};
+ scriptError ( "mySql.easyQuery requires a numeric value for maxRows." )};
- compiledQuery = mysql.compileQuery ( databaseId, queryString ); // this will scriptError on its own if it fails
+ compiledQuery = mySql.compileQuery ( databaseId, queryString ); // this will scriptError on its own if it fails
if compiledQuery > 0 {
loop {
- result = mysql.getRow ( compiledQuery );
+ result = mySql.getRow ( compiledQuery );
if result == 0 { // MySQL's code for no more rows
break};
@@ -40,7 +40,7 @@
dataSet [ rowCount ] = result};
- mysql.clearQuery ( compiledQuery )};
+ mySql.clearQuery ( compiledQuery )};
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.end )}
+ kernel ( mySql.end )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.escapeString )}
+ kernel ( mySql.escapeString )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getAffectedRowCount )}
+ kernel ( mySql.getAffectedRowCount )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getClientInfo )}
+ kernel ( mySql.getClientInfo )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getClientVersion )}
+ kernel ( mySql.getClientVersion )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getColumnCount )}
+ kernel ( mySql.getColumnCount )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -8,10 +8,10 @@
local ( compiledQuery, dataSet = { }, query = "SHOW databases", result, rowCount = 1, rowList );
- compiledQuery = mysql.compileQuery ( databaseId, query );
+ compiledQuery = mySql.compileQuery ( databaseId, query );
loop {
- result = mysql.getRow ( compiledQuery );
+ result = mySql.getRow ( compiledQuery );
if result == 0 {
break};
@@ -20,7 +20,7 @@
++rowCount};
- mysql.clearQuery ( compiledQuery );
+ mySql.clearQuery ( compiledQuery );
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getErrorMessage )}
+ kernel ( mySql.getErrorMessage )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getErrorNumber )}
+ kernel ( mySql.getErrorNumber )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -8,10 +8,10 @@
local ( compiledQuery, dataSet = { }, query = "SHOW COLUMNS FROM " + tableName, result, rowCount = 1, rowList );
- compiledQuery = mysql.compileQuery ( databaseId, query );
+ compiledQuery = mySql.compileQuery ( databaseId, query );
loop {
- result = mysql.getRow ( compiledQuery );
+ result = mySql.getRow ( compiledQuery );
if result == 0 {
break};
@@ -20,7 +20,7 @@
++rowCount};
- mysql.clearQuery ( compiledQuery );
+ mySql.clearQuery ( compiledQuery );
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getHostInfo )}
+ kernel ( mySql.getHostInfo )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getProtocolInfo )}
+ kernel ( mySql.getProtocolInfo )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getQueryInfo )}
+ kernel ( mySql.getQueryInfo )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getQueryWarningCount )}
+ kernel ( mySql.getQueryWarningCount )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getRow )}
+ kernel ( mySql.getRow )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getSQLSTATE )}
+ kernel ( mySql.getSQLSTATE )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getSelectedRowCount )}
+ kernel ( mySql.getSelectedRowCount )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getServerInfo )}
+ kernel ( mySql.getServerInfo )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getServerStatus )}
+ kernel ( mySql.getServerStatus )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.getServerVersion )}
+ kernel ( mySql.getServerVersion )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -8,10 +8,10 @@
local ( compiledQuery, dataSet = { }, query = "SHOW tables", result, rowCount = 1, rowList );
- compiledQuery = mysql.compileQuery ( databaseId, query );
+ compiledQuery = mySql.compileQuery ( databaseId, query );
loop {
- result = mysql.getRow ( compiledQuery );
+ result = mySql.getRow ( compiledQuery );
if result == 0 {
break};
@@ -20,7 +20,7 @@
++rowCount};
- mysql.clearQuery ( compiledQuery );
+ mySql.clearQuery ( compiledQuery );
return ( dataSet )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.init )}
+ kernel ( mySql.init )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.isThreadSafe )}
+ kernel ( mySql.isThreadSafe )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.pingServer )}
+ kernel ( mySql.pingServer )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.seekRow )}
+ kernel ( mySql.seekRow )}
Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc 2007-07-02 03:57:14 UTC (rev 1707)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc 2007-07-02 09:40:45 UTC (rev 1708)
@@ -6,6 +6,6 @@
«5/29/07; 12:00:00 AM by DG
«created
- kernel ( mysql.selectDatabase )}
+ kernel ( mySql.selectDatabase )}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-02 03:57:11
|
Revision: 1707
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1707&view=rev
Author: creecode
Date: 2007-07-01 20:57:14 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
in tableupdatewindowtitles function, bug fix, external value window titles would show path of parent as title, now shows full path, added bsName
Modified Paths:
--------------
Frontier/trunk/Common/source/tableexternal.c
Modified: Frontier/trunk/Common/source/tableexternal.c
===================================================================
--- Frontier/trunk/Common/source/tableexternal.c 2007-07-02 03:47:04 UTC (rev 1706)
+++ Frontier/trunk/Common/source/tableexternal.c 2007-07-02 03:57:14 UTC (rev 1707)
@@ -803,46 +803,52 @@
} /*opnodeistable*/
-static boolean tableupdatewindowtitles (hdlhashnode hnode, hdlhashtable intable) {
+static boolean tableupdatewindowtitles ( hdlhashnode hnode, hdlhashtable intable ) {
- /*
- the indicated table value used to have a different name. if it's
- an external value, update any window titles that depend on its path
-
- 5.0b16 dmb: don't change the titles of file windows, or they'll become
- full paths. later, it would be better to add a fltitlelocked to
- hdlwindowinfo, set after a window.settitle we wouldn't do anything either
- */
+ //
+ // the indicated table value used to have a different name. if it's an
+ // external value, update any window titles that depend on its path
+ //
+ // 2007-07-01 creedon: bug fix, external value window titles would show
+ // path of parent as title, now shows full path, added
+ // bsName
+ //
+ // 5.0b16 dmb: don't change the titles of file windows, or they'll become
+ // full paths. later, it would be better to add a fltitlelocked
+ // to hdlwindowinfo, set after a window.settitle we wouldn't do
+ // anything either
+ //
+ bigstring bsName, bsPath;
hdlhashtable htable;
+ hdlwindowinfo hinfo;
tyvaluerecord val;
- bigstring bspath;
- hdlwindowinfo hinfo;
- val = (**hnode).val;
+ val = ( **hnode ).val;
- if (val.valuetype != externalvaluetype) /*can't be in a window -- unwind recursion*/
- return (true);
+ if ( val.valuetype != externalvaluetype ) // can't be in a window -- unwind
+ // recursion
+ return ( true );
- if (intable == filewindowtable) //5.0b16
- return (true);
+ if ( intable == filewindowtable )
+ return ( true );
- if (langexternalwindowopen (val, &hinfo)) {
+ if ( langexternalwindowopen ( val, &hinfo ) ) {
- gethashkey (hnode, bspath);
+ gethashkey ( hnode, bsName );
- langexternalgetfullpath (intable, bspath, bspath, nil);
+ langexternalgetfullpath ( intable, bsName, bsPath, nil );
- shellsetwindowtitle (hinfo, bspath);
- }
-
- if (langexternalvaltotable (val, &htable, hnode)) {
+ shellsetwindowtitle ( hinfo, bsPath );
- hashtablevisit (htable, (langtablevisitcallback) &tableupdatewindowtitles, htable); /*daisy chain recursion*/
}
- return (true);
- } /*tableupdatewindowtitles*/
+ if ( langexternalvaltotable ( val, &htable, hnode ) )
+ hashtablevisit ( htable, ( langtablevisitcallback ) &tableupdatewindowtitles, htable ); // daisy chain recursion
+
+ return ( true );
+
+ } // tableupdatewindowtitles
static boolean tableupdateoutlinesort (hdlheadrecord hfirst, hdlhashtable htable) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-02 03:47:03
|
Revision: 1706
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1706&view=rev
Author: creecode
Date: 2007-07-01 20:47:04 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
mySql verbs
Added Paths:
-----------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.clearQuery
+
+on clearQuery ( queryId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.clearQuery )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/clearQuery.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.close
+
+on close ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.close )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/close.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.compileQuery
+
+on compileQuery ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.compileQuery )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/compileQuery.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.connect
+
+on connect ( host, user, password, databaseName, port ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.connect )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/connect.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,47 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.easyQuery
+
+on easyQuery ( databaseId, queryString, maxRows = 0 ) {
+
+ «Changes
+ «6/2/07; 12:00:00 AM by DG
+ «only get rows if compiledQuery is greater than zero
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ local ( compiledQuery, dataSet = { }, row, rowCount = 0 );
+
+ on isNum ( s ) {
+ local ( ch, i );
+
+ for i = 1 to string.length ( s ) {
+ ch = string.mid ( s, i, 1 );
+
+ if ( ch < '0' ) or ( ch > '9' ) {
+ return ( false )}};
+
+ return ( true )};
+
+ if not ( isNum ( maxRows ) ) {
+ scriptError ( "mysql.easyQuery requires a numeric value for maxRows." )};
+
+ compiledQuery = mysql.compileQuery ( databaseId, queryString ); // this will scriptError on its own if it fails
+
+ if compiledQuery > 0 {
+ loop {
+ result = mysql.getRow ( compiledQuery );
+
+ if result == 0 { // MySQL's code for no more rows
+ break};
+
+ ++rowCount;
+
+ if ( maxRows > 0 ) and ( rowCount > maxRows ) {
+ break};
+
+ dataSet [ rowCount ] = result};
+
+ mysql.clearQuery ( compiledQuery )};
+
+ return ( dataSet )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/easyQuery.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.end
+
+on end ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.end )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/end.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.escapeString
+
+on escapeString ( databaseId, s ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.escapeString )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/escapeString.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getAffectedRowCount
+
+on getAffectedRowCount ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getAffectedRowCount )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getAffectedRowCount.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getClientInfo
+
+on getClientInfo ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getClientInfo )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientInfo.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getClientVersion
+
+on getClientVersion ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getClientVersion )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getClientVersion.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getColumnCount
+
+on getColumnCount ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getColumnCount )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getColumnCount.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,27 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getDatabaseNames
+
+on getDatabaseNames ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ local ( compiledQuery, dataSet = { }, query = "SHOW databases", result, rowCount = 1, rowList );
+
+ compiledQuery = mysql.compileQuery ( databaseId, query );
+
+ loop {
+ result = mysql.getRow ( compiledQuery );
+
+ if result == 0 {
+ break};
+
+ dataSet [ rowCount ] = string.trimWhiteSpace ( result [ 1 ] );
+
+ ++rowCount};
+
+ mysql.clearQuery ( compiledQuery );
+
+ return ( dataSet )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getDatabaseNames.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getErrorMessage
+
+on getErrorMessage ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getErrorMessage )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorMessage.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getErrorNumber
+
+on getErrorNumber ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getErrorNumber )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getErrorNumber.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,27 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getFieldNames
+
+on getFieldNames ( databaseId, tableName ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ local ( compiledQuery, dataSet = { }, query = "SHOW COLUMNS FROM " + tableName, result, rowCount = 1, rowList );
+
+ compiledQuery = mysql.compileQuery ( databaseId, query );
+
+ loop {
+ result = mysql.getRow ( compiledQuery );
+
+ if result == 0 {
+ break};
+
+ dataSet [ rowCount ] = string.trimWhiteSpace ( result [ 1 ] );
+
+ ++rowCount};
+
+ mysql.clearQuery ( compiledQuery );
+
+ return ( dataSet )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getFieldNames.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getHostInfo
+
+on getHostInfo ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getHostInfo )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getHostInfo.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getProtocolInfo
+
+on getProtocolInfo ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getProtocolInfo )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getProtocolInfo.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getQueryInfo
+
+on getQueryInfo ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getQueryInfo )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryInfo.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getQueryWarningCount
+
+on getQueryWarningCount ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getQueryWarningCount )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getQueryWarningCount.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getRow
+
+on getRow ( queryId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getRow )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getRow.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getSQLSTATE
+
+on getSQLSTATE ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getSQLSTATE )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSQLSTATE.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getSelectedRowCount
+
+on getSelectedRowCount ( queryId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getSelectedRowCount )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getSelectedRowCount.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getServerInfo
+
+on getServerInfo ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getServerInfo )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerInfo.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getServerStatus
+
+on getServerStatus ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getServerStatus )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerStatus.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getServerVersion
+
+on getServerVersion ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.getServerVersion )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getServerVersion.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,27 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.getTableNames
+
+on getTableNames ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ local ( compiledQuery, dataSet = { }, query = "SHOW tables", result, rowCount = 1, rowList );
+
+ compiledQuery = mysql.compileQuery ( databaseId, query );
+
+ loop {
+ result = mysql.getRow ( compiledQuery );
+
+ if result == 0 {
+ break};
+
+ dataSet [ rowCount ] = string.trimWhiteSpace ( result [ 1 ] );
+
+ ++rowCount};
+
+ mysql.clearQuery ( compiledQuery );
+
+ return ( dataSet )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/getTableNames.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.init
+
+on init ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.init )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/init.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.isThreadSafe
+
+on isThreadSafe ( ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.isThreadSafe )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/isThreadSafe.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.pingServer
+
+on pingServer ( databaseId ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.pingServer )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/pingServer.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.seekRow
+
+on seekRow ( queryId, row ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.seekRow )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/seekRow.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc
===================================================================
--- ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc (rev 0)
+++ ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc 2007-07-02 03:47:04 UTC (rev 1706)
@@ -0,0 +1,11 @@
+FrontierVcsFile:3:scpt:system.verbs.builtins.mySql.selectDatabase
+
+on selectDatabase ( databaseId, databaseName ) {
+
+ «Changes
+ «5/29/07; 12:00:00 AM by DG
+ «created
+
+ kernel ( mysql.selectDatabase )}
+
+
Property changes on: ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/selectDatabase.fvc
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-07-02 03:46:21
|
Revision: 1705
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1705&view=rev
Author: creecode
Date: 2007-07-01 20:46:22 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
adding mySql directory
Added Paths:
-----------
ODBs/trunk/frontierRoot/system/verbs/builtins/mySql/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-30 23:03:11
|
Revision: 1704
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1704&view=rev
Author: creecode
Date: 2007-06-30 16:03:13 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
in initenvironment function, isMacOsClassic is always false now that we don't support the Mac Classic nvrionment any longer; for Mac, bug fix for OS version numbers like 10.4.10
Modified Paths:
--------------
Frontier/trunk/Common/source/langstartup.c
Modified: Frontier/trunk/Common/source/langstartup.c
===================================================================
--- Frontier/trunk/Common/source/langstartup.c 2007-06-30 23:01:08 UTC (rev 1703)
+++ Frontier/trunk/Common/source/langstartup.c 2007-06-30 23:03:13 UTC (rev 1704)
@@ -226,121 +226,128 @@
} /*loadfunctionprocessor*/
-static boolean initenvironment (hdlhashtable ht) {
+static boolean initenvironment ( hdlhashtable ht ) {
+ //
+ // 2007-06-29 creedon: isMacOsClassic is always false now that we don't
+ // support the Mac Classic envrionment any longer
+ //
+ // for Mac, bug fix for OS version numbers like 10.4.10
+ //
+ // 2004-11-19 creedon: added isServer
+ //
+ // for Mac, added osBuildNumber, osFullNameForDisplay
+ // ( now a calculated value )
+ //
+
+ bigstring bsos, bsversion;
+ boolean isServer;
+
#ifdef MACVERSION
- bigstring bsversion, bsos; /* 2004-11-19 creedon - added bsos*/
- boolean isMacOsClassic, isServer; /* 2004-11-19 creedon */
+ Handle hcommand, hreturn;
+ bigstring bs;
unsigned long x;
- #if TARGET_API_MAC_CARBON == 1 /*PBS 7.028: system.environment.isCarbon*/
+ newemptyhandle ( &hreturn );
- /* 2004-11-19 creedon - added hcommand, hreturn, bs, response */
- Handle hcommand, hreturn;
- bigstring bs;
- UInt32 response;
- OSErr err;
+ bundle { // system version
- #endif
-
- gestalt (gestaltSystemVersion, (long *)(&x));
-
+ getsystemversionstring ( bsversion, NULL );
+
+ bundle { // major
+
+ bigstring bsSystemVersionMajor;
+
+ nthfield ( bsversion, 1, '.', bsSystemVersionMajor );
+
+ stringtonumber ( bsSystemVersionMajor, &x );
+
+ langassignlongvalue ( ht, str_osMajorVersion, x );
+
+ }
+
+ bundle { // minor
+
+ bigstring bsSystemVersionMinor;
+
+ nthfield ( bsversion, 2, '.', bsSystemVersionMinor );
+
+ stringtonumber ( bsSystemVersionMinor, &x );
+
+ langassignlongvalue ( ht, str_osMinorVersion, x );
+
+ }
+
+ bundle { // bug fix
+
+ bigstring bsSystemVersionBugFix;
+
+ nthfield ( bsversion, 3, '.', bsSystemVersionBugFix );
+
+ stringtonumber ( bsSystemVersionBugFix, &x );
+
+ langassignlongvalue ( ht, str_osPointVersion, x );
+
+ }
+
+ }
+
langassignbooleanvalue (ht, str_isMac, true);
langassignbooleanvalue (ht, str_isWindows, false);
- //langassignstringvalue (ht, str_osFlavor, zerostring);
+ // langassignstringvalue (ht, str_osFlavor, zerostring);
- langassignlongvalue (ht, str_osMajorVersion, bcdtolong (x >> 8)); /* 2004-11-19 creedon - convert from bcd for correct display on Mac OS X */
+ langassignbooleanvalue (ht, str_isCarbon, true);
- langassignlongvalue (ht, str_osMinorVersion, (x & 0x00f0) >> 4);
-
- langassignlongvalue (ht, str_osPointVersion, x & 0x0f); /* 2004-11-19 creedon */
- getsystemversionstring (bsversion, nil);
+ bundle { // get mac os build number
- langassignstringvalue (ht, str_osVersionString, bsversion);
-
- /* langassignstringvalue (ht, str_osFullNameForDisplay, "\x09" "Macintosh"); 2004-11-19 creedon - moved to later in code*/
-
- #if TARGET_API_MAC_CARBON == 1 /*PBS 7.028: system.environment.isCarbon*/
-
- langassignbooleanvalue (ht, str_isCarbon, true);
+ newtexthandle ( "\psw_vers -buildVersion", &hcommand );
- /* 2004-11-19 creedon - get mac os build number, full display name, is server*/
-
- /* get mac os build number */
-
- newtexthandle ("\psw_vers -buildVersion", &hcommand);
+ unixshellcall ( hcommand, hreturn );
- newemptyhandle (&hreturn);
+ texthandletostring ( hreturn, bs );
- unixshellcall (hcommand, hreturn);
+ sethandlesize ( hreturn, 0 );
- texthandletostring (hreturn, bs);
+ setstringlength ( bs, stringlength ( bs ) - 1 );
- sethandlesize (hreturn, 0);
+ langassignstringvalue ( ht, str_osBuildNumber, bs );
- setstringlength (bs, stringlength (bs) - 1);
+ }
- langassignstringvalue (ht, str_osBuildNumber, bs); /* get mac os build number */
-
- /* get os full display name */
-
- copystring ((unsigned char *)"sw_vers -productName", bs);
-
- sethandlecontents (bs, stringsize (bs), hcommand);
-
- unixshellcall (hcommand, hreturn);
-
- texthandletostring (hreturn, bsos);
-
- setstringlength (bsos, stringlength (bsos) - 1); /* get os full display name */
+ bundle { // get os full display name
+
+ copystring ( "\psw_vers -productName", bs );
- disposehandle (hcommand);
- disposehandle (hreturn); /* get mac os build number and full display name*/
+ sethandlecontents ( stringbaseaddress ( bs ), stringlength ( bs ), hcommand );
- /* 2004-11-19 creedon - is mac os classic */
- /* This needs to be checked on Mac OS Classic as well as Mac OS 9 proper. */
+ unixshellcall ( hcommand, hreturn );
- err = gestalt (gestaltMacOSCompatibilityBoxAttr, (long *)(&response));
+ texthandletostring ( hreturn, bsos );
- if ((err == noErr) && ((response & (1 << gestaltMacOSCompatibilityBoxPresent)) != 0))
- isMacOsClassic = true;
- else
- isMacOsClassic = false;
+ setstringlength ( bsos, stringlength ( bsos ) - 1 );
- /* 2004-11-19 creedon - is server */
+ }
- if (equalstrings (bsos, "\pMac OS X Server"))
+ disposehandle ( hcommand );
+
+ disposehandle ( hreturn );
+
+ bundle { // is server
+
+ if ( equalstrings ( bsos, "\pMac OS X Server" ) )
isServer = true;
else
- isServer = false; /* is server */
-
- #else
+ isServer = false;
+ }
- langassignbooleanvalue (ht, str_isCarbon, false);
-
- copystring (BIGSTRING ("\x06" "Mac OS"), bsos); /* 2004-11-19 creedon - Mac OS, used to be Macintosh*/
-
- isMacOsClassic = true; /* 2004-11-19 creedon */
-
- isServer = false; /* 2004-11-19 creedon */
-
- #endif
-
- langassignbooleanvalue (ht, str_isMacOsClassic, isMacOsClassic); /* 2004-11-19 creedon */
-
- langassignstringvalue (ht, str_osFullNameForDisplay, bsos); /* 2004-11-19 creedon - changed "\x06" "Mac OS" to bsos. a calculated value */
-
- langassignbooleanvalue (ht, str_isServer, isServer); /* 2004-11-19 creedon */
-
#endif
#ifdef WIN95VERSION
- bigstring bsversion, bsservicepack, bsos;
- boolean isServer; /* 2004-11-19 creedon */
+ bigstring bsservicepack;
byte bsflavor [4];
OSVERSIONINFO osinfo;
@@ -355,9 +362,11 @@
langassignbooleanvalue (ht, str_isWindows, true);
if (osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+
copystring (BIGSTRING ("\x02" "NT"), bsflavor);
- isServer = true; /* 2004-11-19 creedon */
+ isServer = true;
+
}
else {
@@ -366,9 +375,10 @@
else
copystring (BIGSTRING ("\x02" "98"), bsflavor);
- isServer = false; /* 2004-11-19 creedon */
+ isServer = false;
+
}
-
+
pushstring (bsflavor, bsos);
langassignstringvalue (ht, str_osFlavor, bsflavor);
@@ -381,47 +391,52 @@
getsystemversionstring (bsversion, bsservicepack);
- langassignstringvalue (ht, str_osVersionString, bsversion);
-
langassignstringvalue (ht, str_winServicePackNumber, bsservicepack);
- langassignstringvalue (ht, str_osFullNameForDisplay, bsos);
+ langassignbooleanvalue (ht, str_isCarbon, false); // 7.0b28: isCarbon is false on Windows.
- langassignbooleanvalue (ht, str_isCarbon, false); /*7.0b28: isCarbon is false on Windows.*/
-
- langassignbooleanvalue (ht, str_isMacOsClassic, false); /* 2006-02-18 aradke */
-
- langassignbooleanvalue (ht, str_isServer, isServer); /* 2004-11-19 creedon */
-
#endif
-
- langassignlongvalue (ht, str_maxTcpConnections, maxconnections); /*7.0b37 PBS: max TCP connections*/
+ langassignbooleanvalue ( ht, str_isMacOsClassic, false );
+
+ langassignbooleanvalue ( ht, str_isServer, isServer );
+
+ langassignlongvalue ( ht, str_maxTcpConnections, maxconnections ); // 7.0b37 PBS: max TCP connections
+
+ langassignstringvalue ( ht, str_osFullNameForDisplay, bsos );
+
+ langassignstringvalue ( ht, str_osVersionString, bsversion );
+
#ifdef PIKE
- #ifndef OPMLEDITOR
- langassignbooleanvalue (ht, str_isPike, true);
-
- langassignbooleanvalue (ht, str_isRadio, true); /*7.0b37 PBS: system.environment.isRadio*/
- langassignbooleanvalue (ht, str_isOpmlEditor, false); /*2005-04-06 dluebbert: system.environment.isOPML*/
- langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
- #else // OPMLEDITOR
- langassignbooleanvalue (ht, str_isPike, false);
-
- langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/
- langassignbooleanvalue (ht, str_isOpmlEditor, true); /*2005-04-06 dluebbert: system.environment.isOPML*/
- langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
- #endif // OPMLEDITOR
+
+ #ifndef OPMLEDITOR
+ langassignbooleanvalue (ht, str_isPike, true);
+ langassignbooleanvalue (ht, str_isRadio, true); /*7.0b37 PBS: system.environment.isRadio*/
+ langassignbooleanvalue (ht, str_isOpmlEditor, false); /*2005-04-06 dluebbert: system.environment.isOPML*/
+ langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+
+ #else // OPMLEDITOR
+
+ langassignbooleanvalue (ht, str_isPike, false);
+ langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/
+ langassignbooleanvalue (ht, str_isOpmlEditor, true); /*2005-04-06 dluebbert: system.environment.isOPML*/
+ langassignbooleanvalue (ht, str_isFrontier, false); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+
+ #endif // OPMLEDITOR
+
#else //!PIKE
+
langassignbooleanvalue (ht, str_isPike, false);
-
langassignbooleanvalue (ht, str_isRadio, false); /*7.0b37 PBS: system.environment.isRadio*/
langassignbooleanvalue (ht, str_isOpmlEditor, false); /*2005-04-06 dluebbert: system.environment.isOPML*/
langassignbooleanvalue (ht, str_isFrontier, true); /*2005-04-06 dluebbert: system.environment.isFrontier*/
+
#endif //!PIKE
- return (true);
- } /*initenvironment*/
+ return ( true );
+
+ } // initenvironment
static boolean initCharsetsTable (hdlhashtable cSetsTable)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-30 23:01:06
|
Revision: 1703
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1703&view=rev
Author: creecode
Date: 2007-06-30 16:01:08 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
in getsystemversionstring function, for Mac, bug fix for os version numbers like 10.4.10, old method of using gestaltSystemVersion doesn't work, in future could use gestaltSystemVersionMajor, etc on 10.4 or later
Modified Paths:
--------------
Frontier/trunk/Common/source/ops.c
Modified: Frontier/trunk/Common/source/ops.c
===================================================================
--- Frontier/trunk/Common/source/ops.c 2007-06-30 22:49:41 UTC (rev 1702)
+++ Frontier/trunk/Common/source/ops.c 2007-06-30 23:01:08 UTC (rev 1703)
@@ -38,6 +38,7 @@
#include "ops.h"
#include "langinternal.h"
#include "shell.h"
+#include "sysshellcall.h" // 2007-06-30 creedon
static tydirection directions [ctdirections] = {
@@ -857,34 +858,40 @@
#endif
-void getsystemversionstring (bigstring bs, bigstring bsextrainfo) {
+void getsystemversionstring ( bigstring bs, bigstring bsextrainfo ) {
#ifdef MACVERSION
- long x;
+
+ //
+ // 2007-06-29 creedon: bug fix for os version numbers like 10.4.10,
+ // old method of using gestaltSystemVersion
+ // doesn't work, in future could use
+ // gestaltSystemVersionMajor, etc on 10.4 or later
+ //
- gestalt (gestaltSystemVersion, &x);
+ Handle handleCommand, handleReturn;
- numbertostring (bcdtolong (x >> 8), bs); /* high byte is major rev., 2004-11-16 creedon - convert from bcd for correct display on Mac OS X */
+ newtexthandle ( "\psw_vers -productVersion", &handleCommand );
- pushchar ('.', bs);
+ newemptyhandle ( &handleReturn );
- pushint ((x & 0x00f0) >> 4, bs); /*high nibble of low byte is minor rev*/
+ unixshellcall ( handleCommand, handleReturn );
- x &= 0x0f; /*lowest nibble is minor decimal rev*/
+ disposehandle ( handleCommand );
- if (x) {
-
- pushchar ('.', bs);
-
- pushint (x, bs);
- }
+ texthandletostring ( handleReturn, bs );
- if (bsextrainfo != nil)
- setemptystring (bsextrainfo);
+ setstringlength ( bs, stringlength ( bs ) - 1 );
- #endif
+ disposehandle ( handleReturn );
+
+ if ( bsextrainfo != NULL )
+ setemptystring ( bsextrainfo );
+
+ #endif // MACVERSION
#ifdef WIN95VERSION
+
OSVERSIONINFO osinfo;
osinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
@@ -902,12 +909,15 @@
pushchar ('.', bs);
pushint (LOWORD (osinfo.dwBuildNumber), bs);
+
}
- if (bsextrainfo != nil)
- copyctopstring (osinfo.szCSDVersion, bsextrainfo);
- #endif
- } /*getsystemversionstring*/
+ if ( bsextrainfo != NULL )
+ copyctopstring ( osinfo.szCSDVersion, bsextrainfo );
+
+ #endif // WIN95VERSION
+
+ } // getsystemversionstring
void getsizestring (unsigned long size, bigstring bs) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-30 22:49:43
|
Revision: 1702
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1702&view=rev
Author: creecode
Date: 2007-06-30 15:49:41 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
removed some unused variables ( returnH ) on two functions
Modified Paths:
--------------
Frontier/trunk/Common/source/langmysql.c
Modified: Frontier/trunk/Common/source/langmysql.c
===================================================================
--- Frontier/trunk/Common/source/langmysql.c 2007-06-30 20:13:42 UTC (rev 1701)
+++ Frontier/trunk/Common/source/langmysql.c 2007-06-30 22:49:41 UTC (rev 1702)
@@ -777,11 +777,11 @@
boolean mysqlgetserverversionverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+
MYSQL *dbid; // the MySQL object handle
unsigned long returnCode; // the return code
- Handle returnH = nil; // The handle being returned back to Frontier
- /*
+ /*
mysql.getServerVersion(dbid)
Action: get information about connection to the MySQL server
@@ -823,11 +823,11 @@
boolean mysqlgetprotocolinfoverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- MYSQL *dbid; // the MySQL object handle
+
+ MYSQL *dbid; // the MySQL object handle
unsigned int returnCode; // the return code
- Handle returnH = nil; // The handle being returned back to Frontier
- /*
+ /*
mysql.getProtocolInfo(dbid)
Action: get information about the MySQL protocol version
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-30 20:13:47
|
Revision: 1701
http://svn.sourceforge.net/frontierkernel/?rev=1701&view=rev
Author: creecode
Date: 2007-06-30 13:13:42 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Merged MySQL branch changes r1646:1694 into the trunk.
Modified Paths:
--------------
Frontier/trunk/Common/headers/kernelverbdefs.h
Frontier/trunk/Common/headers/kernelverbs.h
Frontier/trunk/Common/headers/versions.h
Frontier/trunk/Common/resources/Mac/kernelverbs.r
Frontier/trunk/Common/resources/Win32/kernelverbs.rc
Frontier/trunk/Common/source/shell.c
Frontier/trunk/build_VC2K5/Frontier.vcproj
Frontier/trunk/build_Xcode/Frontier Universal Binary.xcodeproj/project.pbxproj
Frontier/trunk/build_Xcode/Frontier.xcodeproj/project.pbxproj
Added Paths:
-----------
Frontier/trunk/Common/MySQL/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/abi_check
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config-os2.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/decimal.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/errmsg.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ft_global.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/hash.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/heap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/help_end.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/help_start.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/keycache.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/m_ctype.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/m_string.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/md5.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_aes.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_alarm.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_alloc.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_base.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_bitmap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_config.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_dbug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_dir.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_getopt.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_global.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_handler.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_libwrap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_list.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_net.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_no_pthread.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_nosys.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_pthread.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_semaphore.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_sys.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_time.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_tree.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_user.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_xml.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisam.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisammrg.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisampack.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_com.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_embed.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_h.ic
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_time.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_version.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysqld_error.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysys_err.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_config_parameters.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_config_parameters_debug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_debug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/ndb_logevent.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/ndbd_exit_codes.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_constants.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_init.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_types.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_version.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/Ndb.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbApi.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbBlob.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbDictionary.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbError.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbIndexOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbIndexScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbPool.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbRecAttr.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbReceiver.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbScanFilter.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbTransaction.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndb_cluster_connection.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndb_opt_defaults.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndbapi_limits.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndberror.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/queues.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/raid.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/rijndael.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sha1.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sql_common.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sql_state.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-case.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-longopts.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-vars.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/t_ctype.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/thr_alarm.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/thr_lock.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/typelib.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/violite.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libdbug.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmygcc.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysql.imp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysqlclient.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysqlclient_r.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmystrings.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysys.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libndbclient.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libz.a
Frontier/trunk/Common/MySQL/osx10.4-i686/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/abi_check
Frontier/trunk/Common/MySQL/osx10.4-i686/include/base64.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/config-os2.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/config.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/decimal.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/errmsg.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ft_global.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/hash.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/heap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/help_end.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/help_start.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/keycache.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/m_ctype.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/m_string.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/md5.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_aes.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_alarm.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_alloc.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_base.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_bitmap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_config.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_dbug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_dir.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_getopt.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_global.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_handler.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_libwrap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_list.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_net.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_no_pthread.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_nosys.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_pthread.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_semaphore.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_sys.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_time.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_tree.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_user.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_xml.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisam.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisammrg.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisampack.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_com.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_embed.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_h.ic
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_time.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_version.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysqld_error.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysys_err.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_config_parameters.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_config_parameters_debug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_debug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/ndb_logevent.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/ndbd_exit_codes.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_constants.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_init.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_types.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_version.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/Ndb.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbApi.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbBlob.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbDictionary.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbError.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbIndexOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbIndexScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbPool.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbRecAttr.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbReceiver.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbScanFilter.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbTransaction.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndb_cluster_connection.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndb_opt_defaults.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndbapi_limits.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndberror.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/queues.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/raid.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/rijndael.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sha1.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sql_common.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sql_state.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-case.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-longopts.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-vars.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/t_ctype.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/thr_alarm.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/thr_lock.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/typelib.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/violite.h
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libdbug.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmygcc.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysql.imp
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysqlclient.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysqlclient_r.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmystrings.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysys.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libndbclient.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libz.a
Frontier/trunk/Common/MySQL/win32/
Frontier/trunk/Common/MySQL/win32/include/
Frontier/trunk/Common/MySQL/win32/include/config-netware.h
Frontier/trunk/Common/MySQL/win32/include/config-os2.h
Frontier/trunk/Common/MySQL/win32/include/config-win.h
Frontier/trunk/Common/MySQL/win32/include/errmsg.h
Frontier/trunk/Common/MySQL/win32/include/libmysql.def
Frontier/trunk/Common/MySQL/win32/include/m_ctype.h
Frontier/trunk/Common/MySQL/win32/include/m_string.h
Frontier/trunk/Common/MySQL/win32/include/my_alloc.h
Frontier/trunk/Common/MySQL/win32/include/my_dbug.h
Frontier/trunk/Common/MySQL/win32/include/my_getopt.h
Frontier/trunk/Common/MySQL/win32/include/my_global.h
Frontier/trunk/Common/MySQL/win32/include/my_list.h
Frontier/trunk/Common/MySQL/win32/include/my_pthread.h
Frontier/trunk/Common/MySQL/win32/include/my_sys.h
Frontier/trunk/Common/MySQL/win32/include/mysql.h
Frontier/trunk/Common/MySQL/win32/include/mysql_com.h
Frontier/trunk/Common/MySQL/win32/include/mysql_embed.h
Frontier/trunk/Common/MySQL/win32/include/mysql_time.h
Frontier/trunk/Common/MySQL/win32/include/mysql_version.h
Frontier/trunk/Common/MySQL/win32/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/win32/include/mysqld_error.h
Frontier/trunk/Common/MySQL/win32/include/raid.h
Frontier/trunk/Common/MySQL/win32/include/typelib.h
Frontier/trunk/Common/MySQL/win32/lib/
Frontier/trunk/Common/MySQL/win32/lib/debug/
Frontier/trunk/Common/MySQL/win32/lib/debug/libmysql.dll
Frontier/trunk/Common/MySQL/win32/lib/debug/libmysql.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/mysqlclient.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/mysys.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/regex.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/strings.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/zlib.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/
Frontier/trunk/Common/MySQL/win32/lib/opt/libmysql.dll
Frontier/trunk/Common/MySQL/win32/lib/opt/libmysql.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysqlclient.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysys-nt.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysys.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/regex.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/strings.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/zlib.lib
Frontier/trunk/Common/headers/langmysql.h
Frontier/trunk/Common/source/langmysql.c
Removed Paths:
-------------
Frontier/trunk/Common/MySQL/osx10.3-powerpc/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/abi_check
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config-os2.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/decimal.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/errmsg.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ft_global.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/hash.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/heap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/help_end.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/help_start.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/keycache.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/m_ctype.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/m_string.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/md5.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_aes.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_alarm.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_alloc.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_base.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_bitmap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_config.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_dbug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_dir.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_getopt.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_global.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_handler.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_libwrap.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_list.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_net.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_no_pthread.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_nosys.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_pthread.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_semaphore.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_sys.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_time.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_tree.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_user.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/my_xml.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisam.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisammrg.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/myisampack.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_com.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_embed.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_h.ic
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_time.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysql_version.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysqld_error.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/mysys_err.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_config_parameters.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_config_parameters_debug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/mgmapi_debug.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/ndb_logevent.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/mgmapi/ndbd_exit_codes.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_constants.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_init.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_types.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndb_version.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/Ndb.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbApi.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbBlob.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbDictionary.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbError.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbIndexOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbIndexScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbPool.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbRecAttr.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbReceiver.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbScanFilter.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/NdbTransaction.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndb_cluster_connection.hpp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndb_opt_defaults.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndbapi_limits.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/ndb/ndbapi/ndberror.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/queues.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/raid.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/rijndael.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sha1.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sql_common.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sql_state.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-case.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-longopts.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/sslopt-vars.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/t_ctype.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/thr_alarm.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/thr_lock.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/typelib.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/violite.h
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libdbug.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmygcc.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysql.imp
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysqlclient.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysqlclient_r.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmystrings.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libmysys.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libndbclient.a
Frontier/trunk/Common/MySQL/osx10.3-powerpc/lib/libz.a
Frontier/trunk/Common/MySQL/osx10.4-i686/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/abi_check
Frontier/trunk/Common/MySQL/osx10.4-i686/include/base64.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/config-os2.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/config.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/decimal.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/errmsg.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ft_global.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/hash.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/heap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/help_end.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/help_start.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/keycache.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/m_ctype.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/m_string.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/md5.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_aes.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_alarm.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_alloc.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_base.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_bitmap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_config.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_dbug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_dir.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_getopt.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_global.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_handler.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_libwrap.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_list.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_net.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_no_pthread.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_nosys.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_pthread.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_semaphore.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_sys.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_time.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_tree.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_user.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/my_xml.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisam.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisammrg.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/myisampack.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_com.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_embed.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_h.ic
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_time.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysql_version.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysqld_error.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/mysys_err.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_config_parameters.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_config_parameters_debug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/mgmapi_debug.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/ndb_logevent.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/mgmapi/ndbd_exit_codes.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_constants.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_init.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_types.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndb_version.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/Ndb.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbApi.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbBlob.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbDictionary.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbError.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbIndexOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbIndexScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbPool.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbRecAttr.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbReceiver.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbScanFilter.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbScanOperation.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/NdbTransaction.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndb_cluster_connection.hpp
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndb_opt_defaults.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndbapi_limits.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/ndb/ndbapi/ndberror.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/queues.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/raid.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/rijndael.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sha1.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sql_common.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sql_state.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-case.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-longopts.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/sslopt-vars.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/t_ctype.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/thr_alarm.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/thr_lock.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/typelib.h
Frontier/trunk/Common/MySQL/osx10.4-i686/include/violite.h
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libdbug.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmygcc.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysql.imp
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysqlclient.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysqlclient_r.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmystrings.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libmysys.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libndbclient.a
Frontier/trunk/Common/MySQL/osx10.4-i686/lib/libz.a
Frontier/trunk/Common/MySQL/win32/
Frontier/trunk/Common/MySQL/win32/include/
Frontier/trunk/Common/MySQL/win32/include/config-netware.h
Frontier/trunk/Common/MySQL/win32/include/config-os2.h
Frontier/trunk/Common/MySQL/win32/include/config-win.h
Frontier/trunk/Common/MySQL/win32/include/errmsg.h
Frontier/trunk/Common/MySQL/win32/include/libmysql.def
Frontier/trunk/Common/MySQL/win32/include/m_ctype.h
Frontier/trunk/Common/MySQL/win32/include/m_string.h
Frontier/trunk/Common/MySQL/win32/include/my_alloc.h
Frontier/trunk/Common/MySQL/win32/include/my_dbug.h
Frontier/trunk/Common/MySQL/win32/include/my_getopt.h
Frontier/trunk/Common/MySQL/win32/include/my_global.h
Frontier/trunk/Common/MySQL/win32/include/my_list.h
Frontier/trunk/Common/MySQL/win32/include/my_pthread.h
Frontier/trunk/Common/MySQL/win32/include/my_sys.h
Frontier/trunk/Common/MySQL/win32/include/mysql.h
Frontier/trunk/Common/MySQL/win32/include/mysql_com.h
Frontier/trunk/Common/MySQL/win32/include/mysql_embed.h
Frontier/trunk/Common/MySQL/win32/include/mysql_time.h
Frontier/trunk/Common/MySQL/win32/include/mysql_version.h
Frontier/trunk/Common/MySQL/win32/include/mysqld_ername.h
Frontier/trunk/Common/MySQL/win32/include/mysqld_error.h
Frontier/trunk/Common/MySQL/win32/include/raid.h
Frontier/trunk/Common/MySQL/win32/include/typelib.h
Frontier/trunk/Common/MySQL/win32/lib/
Frontier/trunk/Common/MySQL/win32/lib/debug/
Frontier/trunk/Common/MySQL/win32/lib/debug/libmysql.dll
Frontier/trunk/Common/MySQL/win32/lib/debug/libmysql.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/mysqlclient.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/mysys.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/regex.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/strings.lib
Frontier/trunk/Common/MySQL/win32/lib/debug/zlib.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/
Frontier/trunk/Common/MySQL/win32/lib/opt/libmysql.dll
Frontier/trunk/Common/MySQL/win32/lib/opt/libmysql.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysqlclient.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysys-nt.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/mysys.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/regex.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/strings.lib
Frontier/trunk/Common/MySQL/win32/lib/opt/zlib.lib
Property Changed:
----------------
Frontier/trunk/build_Xcode/tools/
Copied: Frontier/trunk/Common/MySQL (from rev 1694, Frontier/branches/mysql/Common/MySQL)
Copied: Frontier/trunk/Common/MySQL/osx10.3-powerpc (from rev 1694, Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc)
Copied: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include (from rev 1694, Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc/include)
Deleted: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/abi_check
===================================================================
Copied: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/abi_check (from rev 1694, Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc/include/abi_check)
===================================================================
Deleted: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h
===================================================================
--- Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc/include/base64.h 2007-06-18 04:09:17 UTC (rev 1694)
+++ Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h 2007-06-30 20:13:42 UTC (rev 1701)
@@ -1,50 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#ifndef __BASE64_H_INCLUDED__
-#define __BASE64_H_INCLUDED__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <mysys_priv.h>
-
-/*
- Calculate how much memory needed for dst of base64_encode()
-*/
-int base64_needed_encoded_length(int length_of_data);
-
-/*
- Calculate how much memory needed for dst of base64_decode()
-*/
-int base64_needed_decoded_length(int length_of_encoded_data);
-
-/*
- Encode data as a base64 string
-*/
-int base64_encode(const void *src, size_t src_len, char *dst);
-
-/*
- Decode a base64 string into data
-*/
-int base64_decode(const char *src, size_t src_len, void *dst);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !__BASE64_H_INCLUDED__ */
Copied: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h (from rev 1694, Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc/include/base64.h)
===================================================================
--- Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h (rev 0)
+++ Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/base64.h 2007-06-30 20:13:42 UTC (rev 1701)
@@ -0,0 +1,50 @@
+/* Copyright (C) 2003 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+#ifndef __BASE64_H_INCLUDED__
+#define __BASE64_H_INCLUDED__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include <mysys_priv.h>
+
+/*
+ Calculate how much memory needed for dst of base64_encode()
+*/
+int base64_needed_encoded_length(int length_of_data);
+
+/*
+ Calculate how much memory needed for dst of base64_decode()
+*/
+int base64_needed_decoded_length(int length_of_encoded_data);
+
+/*
+ Encode data as a base64 string
+*/
+int base64_encode(const void *src, size_t src_len, char *dst);
+
+/*
+ Decode a base64 string into data
+*/
+int base64_decode(const char *src, size_t src_len, void *dst);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !__BASE64_H_INCLUDED__ */
Deleted: Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config-os2.h
===================================================================
--- Frontier/branches/mysql/Common/MySQL/osx10.3-powerpc/include/config-os2.h 2007-06-18 04:09:17 UTC (rev 1694)
+++ Frontier/trunk/Common/MySQL/osx10.3-powerpc/include/config-os2.h 2007-06-30 20:13:42 UTC (rev 1701)
@@ -1,835 +0,0 @@
-/* Copyright (C) 2000 MySQL AB & Yuri Dario
- All the above parties has a full, independent copyright to
- the following code, including the right to use the code in
- any manner without any demands from the other parties.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; version 2
- of the License.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA */
-
-/* Defines for OS2 to make it compatible for MySQL */
-
-#ifndef __CONFIG_OS2_H__
-#define __CONFIG_OS2_H__
-
-#include <os2.h>
-#include <math.h>
-#include <io.h>
-#include <types.h>
-
-/* Define to name of system eg solaris*/
-#define SYSTEM_TYPE "IBM OS/2 Warp"
-/* Define to machine type name eg sun10 */
-#define MACHINE_TYPE "i686"
-/* Name of package */
-#define PACKAGE "mysql"
-/* Version number of package */
-#define VERSION MYSQL_SERVER_VERSION
-/* Default socket */
-#define MYSQL_UNIX_ADDR "\\socket\\MySQL"
-
-#define FN_LIBCHAR '\\'
-#define FN_ROOTDIR "\\"
-#define MY_NFILE 1024 /* This is only used to save filenames */
-
-#define HAVE_ACCESS
-
-#define DEFAULT_MYSQL_HOME "c:\\mysql"
-#define DEFAULT_BASEDIR "C:\\"
-#define SHAREDIR "share"
-#define DEFAULT_CHARSET_HOME "C:/mysql/"
-#define _POSIX_PATH_MAX 255
-#define DWORD ULONG
-
-#define O_SHARE 0x1000 /* Open file in sharing mode */
-#define FILE_BINARY O_BINARY /* my_fopen in binary mode */
-#define S_IROTH S_IREAD /* for my_lib */
-
-#define CANT_DELETE_OPEN_FILES /* saves open files in a list, for delayed delete */
-
-#define O_NONBLOCK 0x10
-
-#define NO_OPEN_3 /* For my_create() */
-#define SIGQUIT SIGTERM /* No SIGQUIT */
-#define SIGALRM 14 /* Alarm */
-
-#define NO_FCNTL_NONBLOCK
-
-#define EFBIG E2BIG
-/*#define ENFILE EMFILE */
-/*#define ENAMETOOLONG (EOS2ERR+2) */
-/*#define ETIMEDOUT 145 */
-/*#define EPIPE 146 */
-#define EROFS 147
-
-#define sleep(A) DosSleep((A)*1000)
-#define closesocket(A) soclose(A)
-
-#define F_OK 0
-#define W_OK 2
-
-#define bzero(x,y) memset((x),'\0',(y))
-#define bcopy(x,y,z) memcpy((y),(x),(z))
-#define bcmp(x,y,z) memcmp((y),(x),(z))
-
-#define F_RDLCK 4 /* Read lock. */
-#define F_WRLCK 2 /* Write lock. */
-#define F_UNLCK 0 /* Remove lock. */
-
-#define S_IFMT 0x17000 /* Mask for file type */
-#define F_TO_EOF 0L /* Param to lockf() to lock rest of file */
-
-#define HUGE_PTR
-
-#ifdef __cplusplus
-extern "C"
-#endif
-double _cdecl rint( double nr);
-
-DWORD TlsAlloc( void);
-BOOL TlsFree( DWORD);
-PVOID TlsGetValue( DWORD);
-BOOL TlsSetValue( DWORD, PVOID);
-
-/* support for > 2GB file size */
-#define SIZEOF_OFF_T 8
-#define lseek(A,B,C) _lseek64( A, B, C)
-#define tell(A) _lseek64( A, 0, SEEK_CUR)
-
-void* dlopen( char* path, int flag);
-char* dlerror( void);
-void* dlsym( void* hmod, char* fn);
-void dlclose( void* hmod);
-
-/* Some typedefs */
-typedef unsigned long long os_off_t;
-
-/* config.h. Generated automatically by configure. */
-/* config.h.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if using alloca.c. */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #define HAVE_ALLOCA_H 1 */
-
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define if system calls automatically restart after interruption
- by a signal. */
-/* #undef HAVE_RESTARTABLE_SYSCALLS */
-
-/* Define if your struct stat has st_rdev. */
-#define HAVE_ST_RDEV 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #define HAVE_SYS_WAIT_H 1 */
-
-/* Define if you don't have tm_zone but do have the external array
- tzname. */
-#define HAVE_TZNAME 1
-
-/* Define if utime(file, NULL) sets file's timestamp to the present. */
-#define HAVE_UTIME_NULL 1
-
-/* Define if you have the vprintf function. */
-#define HAVE_VPRINTF 1
-
-/* Define as __inline if that's what the C compiler calls it. */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #undef off_t */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#define STACK_DIRECTION -1
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your <sys/time.h> declares struct tm. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Version of .frm files */
-#define DOT_FRM_VERSION 6
-
-/* READLINE: */
-#define FIONREAD_IN_SYS_IOCTL 1
-
-/* READLINE: Define if your system defines TIOCGWINSZ in sys/ioctl.h. */
-/* #undef GWINSZ_IN_SYS_IOCTL */
-
-/* Do we have FIONREAD */
-#define FIONREAD_IN_SYS_IOCTL 1
-
-/* atomic_add() from <asm/atomic.h> (Linux only) */
-/* #undef HAVE_ATOMIC_ADD */
-
-/* atomic_sub() from <asm/atomic.h> (Linux only) */
-/* #undef HAVE_ATOMIC_SUB */
-
-/* bool is not defined by all C++ compilators */
-#define HAVE_BOOL 1
-
-/* Have berkeley db installed */
-/* #define HAVE_BERKELEY_DB 1 */
-
-/* DSB style signals ? */
-/* #undef HAVE_BSD_SIGNALS */
-
-/* Can netinet be included */
-/* #undef HAVE_BROKEN_NETINET_INCLUDES */
-
-/* READLINE: */
-/* #undef HAVE_BSD_SIGNALS */
-
-/* ZLIB and compress: */
-#define HAVE_COMPRESS 1
-
-/* Define if we are using OSF1 DEC threads */
-/* #undef HAVE_DEC_THREADS */
-
-/* Define if we are using OSF1 DEC threads on 3.2 */
-/* #undef HAVE_DEC_3_2_THREADS */
-
-/* fp_except from ieeefp.h */
-/* #undef HAVE_FP_EXCEPT */
-
-/* READLINE: */
-/* #undef HAVE_GETPW_DECLS */
-
-/* Solaris define gethostbyname_r with 5 arguments. glibc2 defines
- this with 6 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE */
-
-/* In OSF 4.0f the 3'd argument to gethostname_r is hostent_data * */
-/* #undef HAVE_GETHOSTBYNAME_R_RETURN_INT */
-
-/* Define if int8, int16 and int32 types exist */
-/* #undef HAVE_INT_8_16_32 */
-
-/* Define if have -lwrap */
-/* #undef HAVE_LIBWRAP */
-
-/* Define if we are using Xavier Leroy's LinuxThreads */
-/* #undef HAVE_LINUXTHREADS */
-
-/* Do we use user level threads */
-/* #undef HAVE_mit_thread */
-
-/* For some non posix threads */
-/* #undef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC */
-
-/* For some non posix threads */
-/* #undef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */
-
-/* READLINE: */
-#define HAVE_POSIX_SIGNALS 0
-
-/* sigwait with one argument */
-/* #undef HAVE_NONPOSIX_SIGWAIT */
-
-/* pthread_attr_setscope */
-#define HAVE_PTHREAD_ATTR_SETSCOPE 1
-
-/* POSIX readdir_r */
-/* #undef HAVE_READDIR_R */
-
-/* POSIX sigwait */
-/* #undef HAVE_SIGWAIT */
-
-/* crypt */
-#define HAVE_CRYPT 1
-
-/* Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines
- this with 8 arguments */
-/* #undef HAVE_SOLARIS_STYLE_GETHOST */
-
-/* Timespec has a ts_sec instead of tv_sev */
-#define HAVE_TIMESPEC_TS_SEC 1
-
-/* Have the tzname variable */
-#define HAVE_TZNAME 1
-
-/* Define if the system files define uchar */
-/* #undef HAVE_UCHAR */
-
-/* Define if the system files define uint */
-/* #undef HAVE_UINT */
-
-/* Define if the system files define ulong */
-/* #undef HAVE_ULONG */
-
-/* UNIXWARE7 threads are not posix */
-/* #undef HAVE_UNIXWARE7_THREADS */
-
-/* new UNIXWARE7 threads that are not yet posix */
-/* #undef HAVE_UNIXWARE7_POSIX */
-
-/* READLINE: */
-/* #undef HAVE_USG_SIGHOLD */
-
-/* Define if want -lwrap */
-/* #undef LIBWRAP */
-
-/* mysql client protocoll version */
-#define PROTOCOL_VERSION 10
-
-/* Define if qsort returns void */
-#define QSORT_TYPE_IS_VOID 1
-
-/* Define as the return type of qsort (int or void). */
-#define RETQSORTTYPE void
-
-/* Define as the base type of the last arg to accept */
-#define SOCKET_SIZE_TYPE int
-
-/* Last argument to get/setsockopt */
-/* #undef SOCKOPT_OPTLEN_TYPE */
-
-/* #undef SPEED_T_IN_SYS_TYPES */
-/* #undef SPRINTF_RETURNS_PTR */
-#define SPRINTF_RETURNS_INT 1
-/* #undef SPRINTF_RETURNS_GARBAGE */
-
-/* #undef STRUCT_DIRENT_HAS_D_FILENO */
-#define STRUCT_DIRENT_HAS_D_INO 1
-
-/* Define if you want to have threaded code. This may be undef on client code */
-#define THREAD 1
-
-/* Should be client be thread safe */
-/* #undef THREAD_SAFE_CLIENT */
-
-/* READLINE: */
-/* #undef TIOCSTAT_IN_SYS_IOCTL */
-
-/* Use multi-byte character routines */
-/* #undef USE_MB */
-/* #undef USE_MB_IDENT */
-
-/* Use MySQL RAID */
-/* #undef USE_RAID */
-
-/* Use strcoll() functions when comparing and sorting. */
-/* #undef USE_STRCOLL */
-
-/* READLINE: */
-#define VOID_SIGHANDLER 1
-
-/* The number of bytes in a char. */
-#define SIZEOF_CHAR 1
-
-/* The number of bytes in a int. */
-#define SIZEOF_INT 4
-
-/* The number of bytes in a long. */
-#define SIZEOF_LONG 4
-
-/* The number of bytes in a long long. */
-#define SIZEOF_LONG_LONG 8
-
-/* Define if you have the alarm function. */
-#define HAVE_ALARM 1
-
-/* Define if you have the atod function. */
-/* #undef HAVE_ATOD */
-
-/* Define if you have the bcmp function. */
-#define HAVE_BCMP 1
-
-/* Define if you have the bfill function. */
-/* #undef HAVE_BFILL */
-
-/* Define if you have the bmove function. */
-/* #undef HAVE_BMOVE */
-
-/* Define if you have the bzero function. */
-#define HAVE_BZERO 1
-
-/* Define if you have the chsize function. */
-#define HAVE_CHSIZE 1
-
-/* Define if you have the cuserid function. */
-/* #define HAVE_CUSERID 1 */
-
-/* Define if you have the dlerror function. */
-#define HAVE_DLERROR 1
-
-/* Define if you have the dlopen function. */
-#define HAVE_DLOPEN 1
-
-/* Define if you have the fchmod function. */
-/* #undef HAVE_FCHMOD */
-
-/* Define if you have the fcntl function. */
-/* #define HAVE_FCNTL 1 */
-
-/* Define if you have the fconvert function. */
-/* #undef HAVE_FCONVERT */
-
-/* Define if you have the finite function. */
-/* #undef HAVE_FINITE */
-
-/* Define if you have the fpresetsticky function. */
-/* #undef HAVE_FPRESETSTICKY */
-
-/* Define if you have the fpsetmask function. */
-/* #undef HAVE_FPSETMASK */
-
-/* Define if you have the fseeko function. */
-/* #undef HAVE_FSEEKO */
-
-/* Define if you have the ftruncate function. */
-/* #define HAVE_FTRUNCATE 1 */
-
-/* Define if you have the getcwd function. */
-#define HAVE_GETCWD 1
-
-/* Define if you have the gethostbyaddr_r function. */
-/* #undef HAVE_GETHOSTBYADDR_R */
-
-/* Define if you have the gethostbyname_r function. */
-/* #undef HAVE_GETHOSTBYNAME_R */
-
-/* Define if you have the getpagesize function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the getpass function. */
-/*#define HAVE_GETPASS 1 */
-
-/* Define if you have the getpassphrase function. */
-/* #undef HAVE_GETPASSPHRASE */
-
-/* Define if you have the getpwnam function. */
-/* #define HAVE_GETPWNAM 1 */
-
-/* Define if you have the getpwuid function. */
-/* #define HAVE_GETPWUID 1 */
-
-/* Define if you have the getrlimit function. */
-/* #undef HAVE_GETRLIMIT */
-
-/* Define if you have the getrusage function. */
-/* #undef HAVE_GETRUSAGE */
-
-/* Define if you have the getwd function. */
-#define HAVE_GETWD 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define if you have the index function. */
-#define HAVE_INDEX 1
-
-/* Define if you have the initgroups function. */
-/* #undef HAVE_INITGROUPS */
-
-/* Define if you have the localtime_r function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define if you have the locking function. */
-/* #undef HAVE_LOCKING */
-
-/* Define if you have the longjmp function. */
-#define HAVE_LONGJMP 1
-
-/* Define if you have the lrand48 function. */
-/* #undef HAVE_LRAND48 */
-
-/* Define if you have the lstat function. */
-/* #undef HAVE_LSTAT */
-
-/* Define if you have the madvise function. */
-/* #undef HAVE_MADVISE */
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memmove function. */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the mkstemp function. */
-/* #define HAVE_MKSTEMP 1 */
-
-/* Define if you have the mlockall function. */
-/* #undef HAVE_MLOCKALL */
-
-/* Define if you have the perror function. */
-#define HAVE_PERROR 1
-
-/* Define if you have the poll function. */
-/* #undef HAVE_POLL */
-
-/* Define if you have the pread function. */
-/* #undef HAVE_PREAD */
-
-/* Define if you have the pthread_attr_create function. */
-/* #undef HAVE_PTHREAD_ATTR_CREATE */
-
-/* Define if you have the pthread_attr_setprio function. */
-#define HAVE_PTHREAD_ATTR_SETPRIO 1
-
-/* Define if you have the pthread_attr_setschedparam function. */
-/* #undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM */
-
-/* Define if you have the pthread_attr_setstacksize function. */
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-
-/* Define if you have the pthread_condattr_create function. */
-/* #undef HAVE_PTHREAD_CONDATTR_CREATE */
-
-/* Define if you have the pthread_getsequence_np function. */
-/* #undef HAVE_PTHREAD_GETSEQUENCE_NP */
-
-/* Define if you have the pthread_init function. */
-/* #undef HAVE_PTHREAD_INIT */
-
-/* Define if you have the pthread_rwlock_rdlock function. */
-/* #undef HAVE_PTHREAD_RWLOCK_RDLOCK */
-
-/* Define if you have the pthread_setprio function. */
-#define HAVE_PTHREAD_SETPRIO 1
-
-/* Define if you have the pthread_setprio_np function. */
-/* #undef HAVE_PTHREAD_SETPRIO_NP */
-
-/* Define if you have the pthread_setschedparam function. */
-/* #undef HAVE_PTHREAD_SETSCHEDPARAM */
-
-/* Define if you have the pthread_sigmask function. */
-#define HAVE_PTHREAD_SIGMASK 1
-
-/* Define if you have the putenv function. */
-#define HAVE_PUTENV 1
-
-/* Define if you have the readlink function. */
-/* #undef HAVE_READLINK */
-
-/* Define if you have the realpath function. */
-/* #undef HAVE_REALPATH */
-
-/* Define if you have the rename function. */
-#define HAVE_RENAME 1
-
-/* Define if you have the rint function. */
-#define HAVE_RINT 1
-
-/* Define if you have the rwlock_init function. */
-/* #undef HAVE_RWLOCK_INIT */
-
-/* Define if you have the select function. */
-#define HAVE_SELECT 1
-
-/* Define if you have the setenv function. */
-/* #undef HAVE_SETENV */
-
-/* Define if you have the setlocale function. */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the setupterm function. */
-/* #undef HAVE_SETUPTERM */
-
-/* Define if you have the sighold function. */
-/* #undef HAVE_SIGHOLD */
-
-/* Define if you have the sigset function. */
-/* #undef HAVE_SIGSET */
-
-/* Define if you have the sigthreadmask function. */
-/* #undef HAVE_SIGTHREADMASK */
-
-/* Define if you have the snprintf function. */
-/* #define HAVE_SNPRINTF 1 */
-
-/* Define if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define if you have the stpcpy function. */
-/* #undef HAVE_STPCPY */
-
-/* Define if you have the strcasecmp function. */
-/* #undef HAVE_STRCASECMP */
-
-/* Define if you have the strcoll function. */
-#define HAVE_STRCOLL 1
-
-/* Define if you have the strerror function. */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strnlen function. */
-/* #undef HAVE_STRNLEN */
-
-/* Define if you have the strpbrk function. */
-#define HAVE_STRPBRK 1
-
-/* Define if you have the strstr function. */
-#define HAVE_STRSTR 1
-
-/* Define if you have the strtok_r function. */
-/* #undef HAVE_STRTOK_R */
-
-/* Define if you have the strtol function. */
-#define HAVE_STRTOL 1
-
-/* Define if you have the strtoul function. */
-#define HAVE_STRTOUL 1
-
-/* Define if you have the strtoull function. */
-/* #undef HAVE_STRTOULL */
-
-/* Define if you have the tcgetattr function. */
-#define HAVE_TCGETATTR 1
-
-/* Define if you have the tell function. */
-#define HAVE_TELL 1
-
-/* Define if you have the tempnam function. */
-#define HAVE_TEMPNAM 1
-
-/* Define if you have the thr_setconcurrency function. */
-/* #undef HAVE_THR_SETCONCURRENCY */
-
-/* Define if you have the vidattr function. */
-/* #undef HAVE_VIDATTR */
-
-/* Define if you have the <alloca.h> header file. */
-/* #define HAVE_ALLOCA_H 1 */
-
-/* Define if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define if you have the <asm/termbits.h> header file. */
-/* #undef HAVE_ASM_TERMBITS_H */
-
-/* Define if you have the <crypt.h> header file. */
-#define HAVE_CRYPT_H 1
-
-/* Define if you have the <curses.h> header file. */
-/* #define HAVE_CURSES_H 1 */
-
-/* Define if you have the <dirent.h> header file. */
-/* #define HAVE_DIRENT_H 1 */
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <float.h> header file. */
-#define HAVE_FLOAT_H 1
-
-/* Define if you have the <floatingpoint.h> header file. */
-/* #undef HAVE_FLOATINGPOINT_H */
-
-/* Define if you have the <grp.h> header file. */
-/* #define HAVE_GRP_H 1 */
-
-/* Define if you have the <ieeefp.h> header file. */
-/* #undef HAVE_IEEEFP_H */
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ndir.h> header file. */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define if you have the <paths.h> header file. */
-/* #undef HAVE_PATHS_H */
-
-/* Define if you have the <pwd.h> header file. */
-/* #define HAVE_PWD_H 1 */
-
-/* Define if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Define if you have the <select.h> header file. */
-/* #undef HAVE_SELECT_H */
-
-/* Define if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file. */
-/* #define HAVE_STRINGS_H 1 */
-
-/* Define if you have the <synch.h> header file. */
-/* #undef HAVE_SYNCH_H */
-
-/* Define if you have the <sys/dir.h> header file. */
-/* #define HAVE_SYS_DIR_H 1 */
-
-/* Define if you have the <sys/file.h> header file. */
-/* #define HAVE_SYS_FILE_H 1 */
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define if you have the <sys/ndir.h> header file. */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <sys/pte.h> header file. */
-/* #undef HAVE_SYS_PTE_H */
-
-/* Define if you have the <sys/ptem.h> header file. */
-/* #undef HAVE_SYS_PTEM_H */
-
-/* Define if you have the <sys/select.h> header file. ...
[truncated message content] |
|
From: <cre...@us...> - 2007-06-23 23:17:43
|
Revision: 1700
http://svn.sourceforge.net/frontierkernel/?rev=1700&view=rev
Author: creecode
Date: 2007-06-23 16:17:44 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
ported r1597:1673 from trunk
Modified Paths:
--------------
Frontier/branches/Frontier_Long_File_Paths/Common/headers/versions.h
Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/fileops.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/fileverbs.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langsqlite.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langsystypes.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langvalue.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindowverbs.c
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/versions.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/versions.h 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/versions.h 2007-06-23 23:17:44 UTC (rev 1700)
@@ -43,7 +43,7 @@
/* common strings for all targets */
#define APP_COPYRIGHT_FROM "2004"
-#define APP_COPYRIGHT_TILL "2006"
+#define APP_COPYRIGHT_TILL "2007"
/* target-specific strings and version info */
@@ -54,25 +54,25 @@
/* version info for RADIO targets (formerly known as PIKE) */
#define APPNAME "Radio"
- #define APP_COPYRIGHT_HOLDER "UserLand Software, Inc"
+ #define APP_COPYRIGHT_HOLDER "UserLand Software, Inc"
#define bs_APP_NAME BIGSTRING ("\x05" "Radio")
#define bs_APP_SLOGAN BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
#define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
- #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
+ #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
#define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
- #define APP_SUB_VERSION 1
+ #define APP_SUB_VERSION 1
#define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
-
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 12 /* for non-final releases only */
- #define APP_BUILD_NUMBER 12 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a12"
+ #define APP_VERSION_STRING "10.1a14"
#else
@@ -80,52 +80,52 @@
#define APPNAME "OPML"
- #define APP_COPYRIGHT_HOLDER "Scripting News, Inc"
+ #define APP_COPYRIGHT_HOLDER "Scripting News, Inc"
#define bs_APP_NAME BIGSTRING ("\x04" "OPML")
#define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful OPML editing on your desktop")
#define bs_APP_COPYRIGHT BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.")
- #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/")
+ #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/")
#define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
- #define APP_SUB_VERSION 1
+ #define APP_SUB_VERSION 1
#define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 12 /* for non-final releases only */
- #define APP_BUILD_NUMBER 12 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a12"
-
+ #define APP_VERSION_STRING "10.1a14"
+
#endif
#else
/* version info for FRONTIER targets */
#define APPNAME "Frontier"
- #define APP_COPYRIGHT_HOLDER "Frontier Kernel Project"
+ #define APP_COPYRIGHT_HOLDER "Frontier Kernel Project"
#define bs_APP_NAME BIGSTRING ("\x08" "Frontier")
#define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful cross-platform web scripting")
#define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Frontier Kernel Project")
- #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
+ #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
#define APP_MAJOR_VERSION 10
- #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
+ #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */
- #define APP_SUB_VERSION 1
+ #define APP_SUB_VERSION 1
#define APP_MINOR_VERSION 0
- #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
+ #define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 12 /* for non-final releases only */
- #define APP_BUILD_NUMBER 12 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a12"
-
+ #define APP_VERSION_STRING "10.1a14"
+
#endif
#define bs_APP_COPYRIGHT2 BIGSTRING ("\x22" "\xA9 1992-2004 UserLand Software, Inc")
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -85,7 +85,7 @@
typedef struct tyaboutrecord {
-
+
Rect messagearea;
Rect aboutarea;
@@ -95,8 +95,9 @@
boolean flbigwindow;
boolean flextrastats;
-
- long refcon;
+
+ long refcon
+
} tyaboutrecord, *ptraboutrecord, **hdlaboutrecord;
@@ -187,16 +188,17 @@
#ifdef WIN95VERSION
BIGSTRING ("\x14" "Handles Allocated: "),
#endif
-
+
BIGSTRING (""),
-
+
BIGSTRING ("\x10" "Visible Agent: "),
BIGSTRING ("\x0f" "Current Time: "),
bs_APP_NAME, /* 2006-02-06 aradke: see versions.h */
- BIGSTRING ("\x02" "^0"),
+ BIGSTRING ("\x02" "^0")
+
};
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/fileops.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/fileops.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/fileops.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -438,7 +438,7 @@
//
// 1993-09-21 dmb: take vnum as parameter, not volname. otherwise, we can't distinguish between two vols w/the
- // same name.
+ // same name.
//
// 1993-09-07 DW: determine if it's a network volume
//
@@ -488,13 +488,23 @@
void filegetinfofrompb ( FSRefParam *pb, tyfileinfo *info ) {
//
+ // 2007-06-11 creedon: fix for Mac OS X bundles/packages that are
+ // applications not setting creator/type
+ //
+ // fix for flbundle not being set to true for Mac
+ // OS X bundles/packages
+ //
+ // fix for file names that don't have extensions
+ //
// 2006-06-24 creedon: FSRef-ized
//
// 5.1.4 dmb: set finderbits for folders too.
//
- // 1993-09-24 dmb: handle volumes here, combining vol info with root directory folder info. I'm not sure if a
- // volume lock is always reflected in the root directory, so don't set fllocked false if the
- // attribute isn't set in the pb. (it starts out cleared anyway.)
+ // 1993-09-24 dmb: handle volumes here, combining vol info with root
+ // directory folder info. I'm not sure if a volume
+ // lock is always reflected in the root directory, so
+ // don't set fllocked false if the attribute isn't set
+ // in the pb. (it starts out cleared anyway.)
//
unsigned short finderbits;
@@ -534,56 +544,32 @@
if ( ( *info ).flfolder ) {
- boolean flisapplication, flisbundle;
+ ( *info ).flbusy = pb -> catInfo -> valence > 0; // folders are considered "busy" if there are any files within
+ // the folder
- LSIsApplication ( ( *pb ).ref, &flisapplication, &flisbundle );
-
- if ( flisapplication || flisbundle ) { // Mac OS X bundles/packages are not considered folders
-
- ( *info ).flfolder = false;
-
- ( *info ).flbundle = true;
-
- } // if
-
- ( *info ).flbusy = pb -> catInfo -> valence > 0; // Folders are considered "busy" if there are any files
- // within the folder
- if ( ( *info ).flfolder )
-
- ( *info ).filecreator = ( *info ).filetype = ' ';
-
- else {
-
- LSItemInfoRecord iteminfo;
- OSStatus status;
-
- status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestTypeCreator, &iteminfo );
-
- ( *info ).filecreator = iteminfo.creator;
-
- ( *info ).filetype = iteminfo.filetype;
-
- } // if
-
( *info ).iconposition = ( ( FolderInfo * ) pb -> catInfo -> finderInfo ) -> location;
if ( ! ( *info ).flvolume ) { // these aren't the same for a volume & its root dir
-
+
( *info ).ctfiles = pb -> catInfo -> valence;
} // if
- ( *info ).folderview = ( tyfolderview ) 0; // I can't find a way to get this info from FSRefParamPtr, I thought about trying to fake a DInfo structure and getting it from there but it may not even have the right value, I did find a reference to DRMacWindowView // dinfo.frView >> 8;
+ ( *info ).folderview = ( tyfolderview ) 0; // I can't find a way to get this info from FSRefParamPtr, I thought
+ // about trying to fake a DInfo structure and getting it from there
+ // but it may not even have the right value, I did find a reference
+ // to DRMacWindowView // dinfo.frView >> 8;
finderbits = ( ( FolderInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags;
}
+
else { // fill in fields for a file, somewhat different format than a folder
( *info ).ixlabel = ( ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags & kColor ) >> 1;
-
+
( *info ).flbusy = ( pb -> catInfo -> nodeFlags & kFSNodeForkOpenMask ) != 0;
-
+
( *info ).filecreator = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> fileCreator;
( *info ).filetype = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> fileType;
@@ -597,25 +583,79 @@
finderbits = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags;
} // if
-
- /* copy from the finder bits into the record */ {
+
+ /* copy many of the finder bits into the record */ {
+
+ ( *info ).flalias = ( finderbits & kIsAlias ) != 0;
+
+ ( *info ).flbundle = ( finderbits & kHasBundle ) != 0;
+
+ ( *info ).flinvisible = ( finderbits & kIsInvisible ) != 0;
+
+ ( *info ).flstationery = ( finderbits & kIsStationery ) != 0;
+
+ ( *info ).flshared = ( finderbits & kIsShared ) != 0;
+
+ ( *info ).flnamelocked = ( finderbits & kNameLocked ) != 0;
+
+ ( *info ).flcustomicon = ( finderbits & kHasCustomIcon ) != 0;
+
+ } // finder bits
+
+ if ( ( *info ).flfolder ) {
- ( *info ).flalias = (finderbits & kIsAlias) != 0;
+ boolean flIsApplication, flIsBundle;
+
+ LSIsApplication ( ( *pb ).ref, &flIsApplication, &flIsBundle );
+
+ if ( flIsApplication || flIsBundle ) { // Mac OS X bundles/packages are not considered folders
+
+ ( *info ).flfolder = false;
- ( *info ).flbundle = (finderbits & kHasBundle) != 0;
+ ( *info ).flbundle = true;
- ( *info ).flinvisible = (finderbits & kIsInvisible) != 0;
+ } // if
- ( *info ).flstationery = (finderbits & kIsStationery) != 0;
+ if ( flIsApplication ) { // for Mac OS X bundles/packages that are applications we need to grab creator/type
+
+ OSStatus status;
+ LSItemInfoRecord itemInfo;
- ( *info ).flshared = (finderbits & kIsShared) != 0;
+ status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestTypeCreator, &itemInfo );
- ( *info ).flnamelocked = (finderbits & kNameLocked) != 0;
+ ( *info ).filecreator = itemInfo.creator;
- ( *info ).flcustomicon = (finderbits & kHasCustomIcon) != 0;
+ ( *info ).filetype = itemInfo.filetype;
+
+ } // if
- } // finder bits
+ }
+
+ else {
+
+ if ( ! ( *info ).filetype ) { // try to get from file extension
+
+ LSItemInfoRecord iteminfo;
+ OSStatus status;
+ bigstring bsext;
+ clearbytes ( &iteminfo, sizeof ( iteminfo ) );
+
+ status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestExtension, &iteminfo );
+
+ if ( iteminfo.extension != NULL )
+ CFStringRefToStr255 ( iteminfo.extension, bsext );
+
+ if ( isemptystring ( bsext ) || ( stringlength ( bsext ) > 4 ) ) // no extension
+
+ stringtoostype ( "\x04" "????", &( *info ).filetype );
+ else
+ stringtoostype ( bsext, &( *info ).filetype );
+
+ } // if
+
+ } // if
+
} // filegetinfofrompb
@@ -3543,87 +3583,100 @@
} /*initfile*/
-boolean findapplication (OSType creator, ptrfilespec fsapp) {
-
- /*
- 2006-06-25 creedon: for Mac, FSRef-ized
-
- 2006-04-10 creedon: deleted old code, see revision 1246 for old code
-
- 2006-04-09 creedon: use LSFindApplicationForInfo if available
-
- 5.0.1 dmb: implemented for Win using the registry
+boolean findapplication ( OSType creator, ptrfilespec fsapp ) {
- 2.1b11 dmb: loop through all files in each db if necessary to find one that's actually an application
-
- 9/7/92 dmb: make two passes, skipping volumes mounted with a foreign
- file system the first time through. note: if this turns out not to be
- the best criteria, we could check for shared volumes instead by testing
- vMLocalHand in hasdesktopmanager.
+ //
+ // 2007-06-12 creedon: for Mac, use getfilespecparent
+ //
+ // 2006-06-25 creedon: for Mac, FSRef-ized
+ //
+ // 2006-04-10 creedon: deleted old code, see revision 1246 for old code
+ //
+ // 2006-04-09 creedon: use LSFindApplicationForInfo if available
+ //
+ // 5.0.1 dmb: implemented for Win using the registry
+ //
+ // 2.1b11 dmb: loop through all files in each db if necessary to find one
+ // that's actually an application
+ //
+ // 1992-09-07 dmb: make two passes, skipping volumes mounted with a foreign
+ // file system the first time through. note: if this turns
+ // out not to be the best criteria, we could check for
+ // shared volumes instead by testing vMLocalHand in
+ // hasdesktopmanager.
+ //
+ // also: since we don't maintain the desktop DB when we
+ // delete files, we need to verify that the file we locate
+ // still exists. added fileexists call before returning
+ // true.
+ //
+ // 1991-12-05 dmb: created
+ //
- also: since we don't maintain the desktop DB when we delete files, we
- need to verify that the file we locate still exists. added fileexists
- call before returning true.
+ #ifdef MACVERSION
- 12/5/91 dmb
- */
-
- #ifdef MACVERSION
-
- if ((UInt32) LSFindApplicationForInfo == (UInt32) kUnresolvedCFragSymbolAddress)
- return (false);
+ OSStatus status;
- if (LSFindApplicationForInfo (creator, NULL, NULL, &( *fsapp ).fsref, NULL) != noErr)
- return (false);
-
- return (true);
+ if ( ( UInt32 ) LSFindApplicationForInfo == ( UInt32 ) kUnresolvedCFragSymbolAddress )
+ return ( false );
+
+ status = LSFindApplicationForInfo ( creator, NULL, NULL, &( *fsapp ).fsref, NULL);
+
+ if ( status != noErr )
+ return ( false );
+
+ getfilespecparent ( fsapp );
+
+ return ( true );
+
+ #endif // MACVERSION
- #endif /* MACVERSION */
-
#ifdef WIN95VERSION
-
+
byte bsextension [8];
bigstring bsregpath, bsoptions;
-
+
ostypetostring (creator, bsextension);
-
+
poptrailingwhitespace (bsextension);
-
+
insertchar ('.', bsextension);
pushchar (chnul, bsextension);
// copyctopstring ("software\\Microsoft\\Windows\\CurrentVersion", bsregpath);
-
+
if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsextension, NULL, bsregpath))
return (false);
+
+ pushstring ("\x13\\shell\\open\\command", bsregpath);
- pushstring ("\x13\\shell\\open\\command", bsregpath);
-
if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsregpath, NULL, bsregpath))
return (false);
+
+ if (getstringcharacter (bsregpath, 0) == '"') {
- if (getstringcharacter (bsregpath, 0) == '"') {
+ popleadingchars (bsregpath, '"');
- popleadingchars (bsregpath, '"');
-
firstword (bsregpath, '"', bsregpath);
+
}
+
else {
+
+ lastword (bsregpath, ' ', bsoptions);
- lastword (bsregpath, ' ', bsoptions);
-
if (stringlength (bsoptions) < stringlength (bsregpath))
deletestring (bsregpath, stringlength (bsregpath) - stringlength (bsoptions) + 1, stringlength (bsoptions));
}
+
+ return (pathtofilespec (bsregpath, fsapp));
- return (pathtofilespec (bsregpath, fsapp));
+ #endif // WIN95VERSION
+
+ } // findapplication
- #endif /* WIN95VERSION */
- } /* findapplication */
-
-
boolean extendfilespec ( const ptrfilespec fsin, ptrfilespec fsout ) {
//
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/fileverbs.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/fileverbs.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/fileverbs.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -2069,21 +2069,22 @@
#endif
-static boolean findapplicationverb (hdltreenode hparam1, tyvaluerecord *v) {
-
+static boolean findapplicationverb ( hdltreenode hparam1, tyvaluerecord *v ) {
+
OSType creator;
tyfilespec fsapp;
flnextparamislast = true;
- if (!getostypevalue (hparam1, 1, &creator))
- return (false);
+ if ( ! getostypevalue ( hparam1, 1, &creator ) )
+ return ( false );
+
+ if ( ! findapplication ( creator, &fsapp ) )
+ clearbytes ( &fsapp, sizeof ( fsapp ) );
+
+ return ( setfilespecvalue ( &fsapp, v ) );
- if (!findapplication (creator, &fsapp))
- clearbytes (&fsapp, sizeof (fsapp));
-
- return (setfilespecvalue (&fsapp, v));
- } /*findapplicationverb*/
+ } // findapplicationverb
#ifdef WIN95VERSION
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -76,7 +76,7 @@
#define fldebugwebsite false
-#define str_separatorline BIGSTRING ("\x17<hr size=2 width=100% />\r") // 2005-12-18 creedon - end tag with space slash for compatibility with post HTML 4.01 standards
+#define str_separatorline BIGSTRING ("\x17<hr size=\"2\" width=\"100%\" />\r") // 2005-12-18 creedon - end tag with space slash for compatibility with post HTML 4.01 standards
#define str_macroerror BIGSTRING ("\x20<b>[</b>Macro error: ^0<b>]</b>\r")
#define str_mailto BIGSTRING ("\x1A<a href=\"mailto:^0\">^0</a>")
#define str_hotlink BIGSTRING ("\x13<a href=\"^0\">^1</a>")
@@ -207,7 +207,7 @@
#define STR_P_CONDITION BIGSTRING ("\x09" "condition")
#define STR_P_RESPONDER BIGSTRING ("\x09" "responder")
#define STR_P_PATHARGS BIGSTRING ("\x08" "pathArgs")
-#define STR_P_ADRTABLE BIGSTRING ("\x08" "adrTable")
+#define STR_P_ADRTABLE BIGSTRING ("\x08" "adrTable")
#define STR_P_FLPARAMS BIGSTRING ("\x08" "flParams")
#define STR_P_ENABLED BIGSTRING ("\x07" "enabled")
#define STR_P_REQUEST BIGSTRING ("\x07" "request")
@@ -247,6 +247,7 @@
#define STR_P_DOLLAR BIGSTRING ("\x01" "$")
#define STR_P_SPACE BIGSTRING ("\x01" " ")
#define STR_P_EMPTY BIGSTRING ("\x00")
+#define STR_P_USERWEBSERVERSTRING BIGSTRING ( "\x11" "headerFieldServer" )
#define STR_STATUSCONTINUE "HTTP/1.1 100 CONTINUE\r\n\r\n"
#define sizestatuscontinue 25
@@ -5781,37 +5782,88 @@
} /*webserverparsecookies*/
-static boolean webservergetserverstring (tyvaluerecord *vreturn) {
+static boolean webservergetpref ( bigstring bsprefname, tyvaluerecord *vreturn ) {
+
+ //
+ // 2007-06-23 creedon: support for long odb item names and file paths
+ //
+ // 6.1d4 AR: Reviewed for proper error handling and reporting.
+ //
+ // 6.1d2 AR: A utility function for getting a pref from
+ // user.webserver.prefs. If no value is found in that table, we
+ // return false in vreturn.
+ //
+ // 2007-06-02 aradke: Don't set *vreturn to false if the requested pref
+ // doesn't exist. return false instead. This makes it
+ // possible for the caller to differentiate between a
+ // non-existant pref and one that is actually set to
+ // false.
+ //
+
+ boolean fl;
+ hdlhashnode hnode;
+ hdlhashtable hprefstable;
+ tyvaluerecord val;
+
+ disablelangerror ();
+
+ fl = langfastaddresstotable ( roottable, NULL, STR_P_USERWEBSERVERPREFS,
+ &hprefstable ) && langHashTableLookupBigstring ( hprefstable,
+ bsprefname, &val, &hnode );
+
+ if (fl)
+ fl = copyvaluerecord (val, vreturn);
+
+ if (fl)
+ if ((*vreturn).valuetype == externalvaluetype)
+ if (langexternalgettype (*vreturn) == idwordprocessor)
+ fl = coercetostring (vreturn);
+
+ enablelangerror ();
+
+ return (fl);
+
+ } // webservergetpref
- /*
- 6.1d2 AR: Return a string identifying the server software, i.e. UserLand Frontier/6.1d2-WinNT
+
+static boolean webservergetserverstring ( tyvaluerecord *vreturn ) {
+
+ //
+ // 2007-06-02 creedon: call webservergetpref to grab value at
+ // user.webserver.prefs.headerFieldServer if defined
+ //
+ // 6.1d2 AR: Return a string identifying the server software, i.e.
+ // Frontier/6.1d2-WinNT
+ //
+ // 6.1d4 AR: Reviewed for proper error handling and reporting.
+ //
- 6.1d4 AR: Reviewed for proper error handling and reporting.
- */
-
- Handle h = NULL;
+ Handle h = nil;
tyvaluerecord vversion, vos;
- if (!newtexthandle (STR_P_SERVERSTRING, &h))
- return (false);
+ if ( webservergetpref ( STR_P_USERWEBSERVERSTRING, vreturn ) )
+ return ( true );
+
+ if ( ! newtexthandle ( STR_P_SERVERSTRING, &h ) )
+ return ( false );
- if (!frontierversion (&vversion))
+ if ( ! frontierversion ( &vversion ) )
goto exit;
- if (!sysos (&vos))
+ if ( ! sysos ( &vos ) )
goto exit;
- if (!parsedialoghandle (h, vversion.data.stringvalue, vos.data.stringvalue, nil, nil))
+ if ( ! parsedialoghandle ( h, vversion.data.stringvalue, vos.data.stringvalue, nil, nil ) )
goto exit;
- return (setheapvalue (h, stringvaluetype, vreturn));
+ return ( setheapvalue ( h, stringvaluetype, vreturn ) );
exit:
- disposehandle (h);
+ disposehandle ( h );
+
+ return ( false );
- return (false);
-
} // webservergetserverstring
@@ -6213,45 +6265,7 @@
505 HTTP Version Not Supported
*/
-#if 0
-static boolean webservergetpref (bigstring bsprefname, tyvaluerecord *vreturn) {
-
- /*
- 6.1d2 AR: A utility function for getting a pref from user.webserver.prefs.
- If no value is found in that table, we return false in vreturn.
-
- 6.1d4 AR: Reviewed for proper error handling and reporting.
- */
-
- hdlhashtable hprefstable;
- tyvaluerecord val;
- boolean fl;
- hdlhashnode hnode;
-
- disablelangerror ();
-
- fl = langfastaddresstotable (roottable, STR_P_USERWEBSERVERPREFS, &hprefstable)
- && langhashtablelookup (hprefstable, bsprefname, &val, &hnode);
-
- enablelangerror ();
-
- if (!fl)
- return (setbooleanvalue (false, vreturn));
-
- if (!copyvaluerecord (val, vreturn))
- return (false);
-
- if ((*vreturn).valuetype == externalvaluetype)
- if (langexternalgettype (*vreturn) == idwordprocessor)
- coercetostring (vreturn);
-
- return (true);
- } /*webservergetpref*/
-
-#endif
-
-
static boolean webservergetrespondertableaddress ( const Handle handleName, tyaddress *adr) {
//
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langsqlite.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langsqlite.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langsqlite.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -76,7 +76,7 @@
include new files in the SQLite project, be sure that shell.c and tclsqlite.c are
NOT included in the Frontier project.
-That's it. For further tips, see the Frontier Lab Notebook article at:
+That's it. For further tips, see the Frontier Lab Notebook article:
http://manila.zatz.com/frontierkernel/stories/storyReader$29
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langsystypes.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langsystypes.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langsystypes.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -580,25 +580,32 @@
#ifdef MACVERSION
static boolean stringtoalias ( tyvaluerecord *val ) {
-
+
//
+ // 2007-06-11 creedon: fileexists wasn't working, need to extend the
+ // filespec, if successful then file exists
+ //
// 2006-06-24 creedon: FSRef-ized
//
- // 2.1b2 dmb: try converting to a filespec first to ensure that partial path or
- // drive number if processed properly. also, in the filespec case, the alias isn't
- // minimal
+ // 2.1b2 dmb: try converting to a filespec first to ensure that
+ // partial path or drive number if processed properly.
+ // also, in the filespec case, the alias isn't minimal
//
- // 1992-07-23 dmb: OK, try to getfullfilepath, but with errors disabled
+ // 1992-07-23 dmb: OK, try to getfullfilepath, but with errors
+ // disabled
//
- // 1992-07-02 dmb: don't call getfullfilepath; makes it impossible to create aliases of
- // not-yet-existing files, or offline volumes
+ // 1992-07-02 dmb: don't call getfullfilepath; makes it impossible to
+ // create aliases of not-yet-existing files, or
+ // offline volumes
//
- // 1991-10-07 dmb: make sure we're actually passing a full path to the NewAlias routine
+ // 1991-10-07 dmb: make sure we're actually passing a full path to the
+ // NewAlias routine
//
+ register Handle htext;
+
AliasHandle halias;
OSErr err;
- register Handle htext;
tyfilespec fs;
clearbytes ( &fs, sizeof ( fs ) );
@@ -696,7 +703,7 @@
return ( true );
} // stringtoalias
-
+
#endif
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langvalue.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langvalue.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langvalue.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -3526,40 +3526,50 @@
boolean coercetostring (tyvaluerecord *val) {
-
+
//
- // 2007-02-24 creedon: support for long odb item names and file paths
+ // 2007-06-23 creedon: support for long odb item names and file paths
//
+ // 2007-06-12 creedon: empty bs at start of function, fix for problem
+ // w/filespecvaluetype case returning gibberish for
+ // invalid fs
+ //
// 2006-06-24 creedon: for Mac, FSRef-ized
//
- // 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a reasonable display string for externals
+ // 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a
+ // reasonable display string for externals
//
// 2.1b3 dmb: don't ignore return value from objspectostring
//
- // 1992-08-10 dmb: added flcoerceexternaltostring flag to prevent external-to-string coercion except when explicitly
- // requested by stringfunc in langverbs.c
+ // 1992-08-10 dmb: added flcoerceexternaltostring flag to prevent
+ // external-to-string coercion except when explicitly
+ // requested by stringfunc in langverbs.c
//
+ register tyvaluerecord *v = val;
+
Handle h;
bigstring bs;
- register tyvaluerecord *v = val;
+ setemptystring ( bs );
+
if (!langheapallocated (v, &h))
h = nil;
+
+ switch ((*v).valuetype) {
- switch ((*v).valuetype) {
-
case stringvaluetype:
return (true);
+
+ case novaluetype: {
- case novaluetype:
- if (flinhibitnilcoercion)
- return (false);
+ if ( flinhibitnilcoercion )
+ return ( false );
+
+ break;
- setemptystring (bs);
+ }
- break;
-
/*
case passwordvaluetype:
(*v).valuetype = stringvaluetype;
@@ -3569,46 +3579,46 @@
case addressvaluetype:
return ( addressToHandle ( v ) );
-
+
case booleanvaluetype:
if ((*v).data.flvalue)
copystring (bstrue, bs);
else
copystring (bsfalse, bs);
-
+
break;
case charvaluetype:
setstringwithchar ((*v).data.chvalue, bs);
break;
-
+
case intvaluetype:
shorttostring ((*v).data.intvalue, bs);
break;
-
+
case longvaluetype:
numbertostring ((*v).data.longvalue, bs);
break;
-
+
case ostypevaluetype:
case enumvaluetype:
ostypetostring ((*v).data.ostypevalue, bs);
break;
-
+
case directionvaluetype:
dirtostring ((*v).data.dirvalue, bs);
break;
-
+
case datevaluetype:
timedatestring ((*v).data.datevalue, bs);
break;
-
+
case fixedvaluetype: {
double x = (double) (*v).data.longvalue / 65536;
@@ -3620,43 +3630,43 @@
break;
}
-
+
case singlevaluetype:
floattostring ((*v).data.singlevalue, bs);
break;
-
+
case doublevaluetype:
floattostring (**(*v).data.doublevalue, bs);
break;
-
+
case pointvaluetype:
pointtostring ((*v).data.pointvalue, bs);
break;
-
+
case rectvaluetype:
recttostring (**(*v).data.rectvalue, bs);
break;
-
+
case rgbvaluetype:
rgbtostring (**(*v).data.rgbvalue, bs);
break;
-
+
case patternvaluetype:
patterntostring (**(*v).data.patternvalue, bs);
break;
-
+
case objspecvaluetype:
if (!objspectostring ((*v).data.objspecvalue, bs))
return (false);
+
+ break;
- break;
-
case aliasvaluetype:
if ( ! newemptyhandle ( &h ) )
@@ -3678,9 +3688,9 @@
if ( ! newemptyhandle ( &h ) )
return ( false );
-
- tyfilespec fs = **(*v).data.filespecvalue;
-
+
+ tyfilespec fs = **( *v ).data.filespecvalue;
+
filespectopath ( &fs, &h );
disposevaluerecord ( *v, true );
@@ -3692,17 +3702,17 @@
case binaryvaluetype:
if (!copyvaluedata (v))
return (false);
-
+
stripbinarytypeid ((*v).data.binaryvalue);
(*v).valuetype = stringvaluetype;
return (true);
-
+
case listvaluetype:
case recordvaluetype:
return (coercelistvalue (v, stringvaluetype));
-
+
case codevaluetype:
bigvaltostring (v, bs);
@@ -3710,7 +3720,7 @@
case externalvaluetype:
if (!flcoerceexternaltostring) {
-
+
/* 4.1b4 dmb*/
/*
langbadexternaloperror (badexternaloperationerror, *v);
@@ -3731,11 +3741,11 @@
return (false);
}
-
+
disposevaluerecord (*v, true);
return (setheapvalue (h, stringvaluetype, v));
-
+
default:
langerror (stringcoerceerror);
@@ -3743,7 +3753,7 @@
return (false);
} // switch
-
+
disposevaluerecord (*v, true);
return (setstringvalue (bs, v));
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -1303,7 +1303,7 @@
#if isFrontier || flruntime || winhybrid
initlang (); /*init callbacks and other basic inits*/
-
+
langcallbacks.processeventcallback = &shellprocessevent; /*4.1b13 dmb - new*/
if (!inittablestructure ()) /*create initial hashtable structure*/
@@ -1326,7 +1326,7 @@
xmlinitverbs ();
htmlinitverbs ();
-
+
sqliteinitverbs (); /* 2006-03-15 gewirtz: langsqlite.c */
#ifdef flregexpverbs
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindowverbs.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindowverbs.c 2007-06-23 19:41:49 UTC (rev 1699)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindowverbs.c 2007-06-23 23:17:44 UTC (rev 1700)
@@ -1107,26 +1107,36 @@
} /*settitleverb*/
-static boolean getfileverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
+static boolean getfileverb ( hdltreenode hparam1, tyvaluerecord *vreturned ) {
+
+ //
+ // 2007-04-03 creedon: use getfilespecparent to return an unextended
+ // filespec
+ //
+ // 1992-06-24 dmb: get the title of the object or window indicated in
+ // hparam1. if it's not an external value or a window,
+ // always return the empty string
+ //
- /*
- 6/24/92 dmb: get the title of the object or window indicated in hparam1.
- if it's not an external value or a window, always return the empty string
- */
-
hdlwindowinfo hinfo;
tyfilespec fs;
flnextparamislast = true;
- if (!getwinparam (hparam1, 1, &hinfo))
- return (false);
+ if ( ! getwinparam ( hparam1, 1, &hinfo ) )
+ return ( false );
+
+ if ( ( hinfo != nil ) && windowgetfspec ( ( **hinfo ).macwindow, &fs ) ) {
- if ((hinfo != nil) && windowgetfspec ((**hinfo).macwindow, &fs))
- return (setfilespecvalue (&fs, vreturned));
+ getfilespecparent ( &fs );
+
+ return ( setfilespecvalue ( &fs, vreturned ) );
+
+ }
+
+ return ( setstringvalue ( zerostring, vreturned ) );
- return (setstringvalue (zerostring, vreturned));
- } /*getfileverb*/
+ } // getfileverb
static boolean windowfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-23 19:41:51
|
Revision: 1699
http://svn.sourceforge.net/frontierkernel/?rev=1699&view=rev
Author: creecode
Date: 2007-06-23 12:41:49 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
support for long odb item names and file paths
formatting tweaks
Modified Paths:
--------------
Frontier/branches/Frontier_Long_File_Paths/Common/headers/claybrowserstruc.h
Frontier/branches/Frontier_Long_File_Paths/Common/headers/frontierdefs.h
Frontier/branches/Frontier_Long_File_Paths/Common/headers/lang.h
Frontier/branches/Frontier_Long_File_Paths/Common/source/OpenTransportNetEvents.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/cancoon.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowserstruc.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowservalidate.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langevaluate.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langexternal.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langhash.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langops.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langvalue.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langverbs.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langxml.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/memory.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/opedit.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/opstructure.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/opverbs.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/opvisit.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/osacomponent.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/scripts.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellcallbacks.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellmenu.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindow.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellwindowverbs.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/strings.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/tableops.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/tablepack.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/tablevalidate.c
Frontier/branches/Frontier_Long_File_Paths/Common/stubs/megastubs.c
Frontier/branches/Frontier_Long_File_Paths/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/claybrowserstruc.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/claybrowserstruc.h 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/claybrowserstruc.h 2007-06-23 19:41:49 UTC (rev 1699)
@@ -25,47 +25,50 @@
******************************************************************************/
+
#ifndef claybrowserstrucinclude
-#define claybrowserstrucinclude
-
-#include "claybrowser.h"
-
-extern boolean lineinsertedcallbackdisabled;
-
-extern boolean browserdeletenodeswithtmpbitset (void);
-
-extern boolean browsercommitchanges (void);
-
-extern boolean browsercopyrefcon (hdlheadrecord, hdlheadrecord);
-
-extern boolean browsertextualizerefcon (hdlheadrecord, Handle);
-
-extern boolean browserreleaserefcon (hdlheadrecord, boolean);
-
-extern boolean browserpredrag (hdlheadrecord *, tydirection *);
-
-extern boolean browserdragcopy (hdlheadrecord, hdlheadrecord);
-
-extern boolean browserexportscrap (hdloutlinerecord);
-
-extern void browsersortfolder (hdlheadrecord);
-
-extern boolean browsergetparentspec (hdlheadrecord, tybrowserspec *);
-
-extern void browserinsertagain (hdlheadrecord);
-
-extern boolean browserlineinserted (hdlheadrecord);
-
-extern boolean browserlinedeleted (hdlheadrecord);
-
-extern boolean browserclearundo (void);
-
-extern boolean browsersetscrap (hdloutlinerecord);
-
-extern boolean browsergetscrap (hdloutlinerecord *, boolean *);
-
-extern boolean browserdeletedummyvalues (hdlheadrecord);
-
+ #define claybrowserstrucinclude
+
+
+ #include "claybrowser.h"
+
+
+ extern boolean lineinsertedcallbackdisabled;
+
+ extern boolean browserdeletenodeswithtmpbitset (void);
+
+ extern boolean browsercommitchanges (void);
+
+ extern boolean browsercopyrefcon (hdlheadrecord, hdlheadrecord);
+
+ extern boolean browsertextualizerefcon (hdlheadrecord, Handle);
+
+ extern boolean browserreleaserefcon (hdlheadrecord, boolean);
+
+ extern boolean browserpredrag (hdlheadrecord *, tydirection *);
+
+ extern boolean browserdragcopy (hdlheadrecord, hdlheadrecord);
+
+ extern boolean browserexportscrap (hdloutlinerecord);
+
+ extern void browsersortfolder (hdlheadrecord);
+
+ extern boolean browsergetparentspec (hdlheadrecord, tybrowserspec *);
+
+ extern void browserinsertagain (hdlheadrecord);
+
+ extern boolean browserlineinserted (hdlheadrecord);
+
+ extern boolean browserlinedeleted (hdlheadrecord);
+
+ extern boolean browserclearundo (void);
+
+ extern boolean browsersetscrap (hdloutlinerecord);
+
+ extern boolean browsergetscrap (hdloutlinerecord *, boolean *);
+
+ extern boolean browserdeletedummyvalues (hdlheadrecord);
+
#endif
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/frontierdefs.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/frontierdefs.h 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/frontierdefs.h 2007-06-23 19:41:49 UTC (rev 1699)
@@ -52,15 +52,24 @@
#ifdef MACVERSION
+
#define flcomponent 1
+
#ifdef __powerc
+
#define noextended 1
+
#elif defined(__GNUC__)
+
#define noextended 1
+
#else
+
#define noextended 0
+
#endif
-#endif /* MACVERSION */
+
+ #endif // MACVERSION
#undef MEMTRACKER /* define as 1 to enable tracking of memory allocations */
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/lang.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/lang.h 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/lang.h 2007-06-23 19:41:49 UTC (rev 1699)
@@ -415,6 +415,7 @@
/*param1 - param4 must be at the end of the record - see newtreenode*/
struct tytreenode **param1, **param2, **param3, **param4;
+
} tytreenode, *ptrtreenode, **hdltreenode;
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/OpenTransportNetEvents.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/OpenTransportNetEvents.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/OpenTransportNetEvents.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -2252,7 +2252,7 @@
doLeave = OTEnterNotifier (epref->ep);
- /*bundle*/ {
+ bundle {
if (listenref != nil) { /*required to keep the stats accurate if CheckUnbind is called*/
listenref->stats.ctwaiting--;
@@ -3912,8 +3912,8 @@
doLeave = OTEnterNotifier (epref->ep);
-
- /*bundle*/ {
+ bundle {
+
ListenRecordRef listenref = epref->listener;
DoSndOrderlyDisconnect (epref, true);
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/cancoon.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/cancoon.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/cancoon.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -509,8 +509,8 @@
create the standard global tables
*/
- /* register */ hdlcancoonrecord hc = hcancoon;
- /* register */ boolean fl;
+ register hdlcancoonrecord hc = hcancoon;
+ register boolean fl;
Handle hvariable;
hdlhashtable htable;
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowserstruc.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowserstruc.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowserstruc.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -414,7 +414,7 @@
static boolean getundofolderspec ( void ) {
//
- // 2007-01-17 creedon: support for long odb item names and file paths
+ // 2007-03-01 creedon: support for long odb item names and file paths
//
Handle h;
@@ -422,6 +422,8 @@
if ( folderfound )
return ( true );
+
+ clearbytes ( &undofolderspec, sizeof ( undofolderspec ) );
if ( ! newtexthandle ( BIGSTRING ( "\x04" "Undo" ), &h ) )
return ( false );
@@ -433,18 +435,22 @@
return ( folderfound );
} // getundofolderspec
-
-
+
+
static boolean getclipfolderspec ( void ) {
+ //
+ // 2007-03-01 creedon: support for long odb item names and file paths
+ //
+
Handle h;
static boolean folderfound = false;
- clearbytes ( &undofolderspec, sizeof ( clipfolderspec ) );
+ if ( folderfound )
+ return ( true );
+
+ clearbytes ( &clipfolderspec, sizeof ( clipfolderspec ) );
- if (folderfound)
- return (true);
-
if ( ! newtexthandle ( BIGSTRING ( "\x09" "Clipboard" ), &h ) )
return ( false );
@@ -452,9 +458,9 @@
disposehandle ( h );
- return (folderfound);
+ return ( folderfound );
- } /*getclipfolderspec*/
+ } // getclipfolderspec
boolean browserclearundo (void) {
@@ -467,8 +473,9 @@
static boolean deletetmpbitvisit (hdlheadrecord hnode, ptrvoid refcon) {
-#pragma unused (refcon)
+ #pragma unused (refcon)
+
if ((**hnode).tmpbit) {
(**hnode).tmpbit = false;
@@ -476,9 +483,11 @@
opdeletenode (hnode);
browsercommitchanges (); /*moves the file into the undo folder*/
+
}
return (true); /*keep visiting*/
+
} /*deletetmpbitvisit*/
@@ -488,7 +497,8 @@
delete files with their tmp bits turned on
*/
- return (opsiblingvisiter ((**outlinedata).hsummit, true, &deletetmpbitvisit, nil));
+ return (opsiblingvisiter ((**outlinedata).hsummit, true, &deletetmpbitvisit, nil));
+
} /*browserdeletenodeswithtmpbitset*/
@@ -556,6 +566,7 @@
return (false);
}
else {
+
if (!(**hnode).flnodeonscrap) { /*we own this file -- move it*/
if ( ( ( fssource.vRefNum == fsdest.vRefNum ) || ( fssource.vRefNum == 0 ) || ( fsdest.vRefNum == 0 ) ) &&
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowservalidate.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowservalidate.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/claybrowservalidate.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -463,20 +463,20 @@
static boolean compareforcopyvisit (hdlheadrecord hnode, ptrvoid refcon) {
-
+
bigstring bs, bsnode;
ptrdraginfo draginfo = (ptrdraginfo) refcon;
if (hnode == (*draginfo).hcompare)
return (true);
-
+
opgetheadstring (hnode, bsnode);
opgetheadstring ((*draginfo).hcompare, bs);
if (!equalidentifiers (bsnode, bs))
return (true);
-
+
copystring (BIGSTRING ("\x06" "Can\xD5t "), bs);
pushstring (pcommand, bs);
@@ -490,22 +490,25 @@
alertdialog (bs);
return (false); /*stop both traversals*/
+
} /*compareforcopyvisit*/
static boolean validatecopyvisit (hdlheadrecord hnode, ptrvoid refcon) {
-#pragma unused (refcon)
+ #pragma unused (refcon)
+
tydraginfo draginfo;
draginfo.hcompare = hnode;
return (opvisitmarked (down, &compareforcopyvisit, &draginfo));
+
} /*validatecopyvisit*/
boolean browservalidatecopy (bigstring bscommand) {
-
+
/*
don't allow a copy if there's a node selected that has the
same name as another node that's selected. we do the dialog
@@ -515,6 +518,6 @@
pcommand = bscommand; /*set static to point to string*/
return (opvisitmarked (down, &validatecopyvisit, nil));
+
} /*browservalidatecopy*/
-
-
+
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -314,16 +314,10 @@
tyvaluerecord val;
if ((*fsfolder).parID == nil) {
+
+ assert ( textHandleEqualsBigstring ( ( *fsfolder ).name,
+ nameroottable, true ) );
- Handle h;
-
- if ( ! newtexthandle ( nameroottable, &h ) )
- return ( false );
-
- assert ( equalhandles ( (*fsfolder).name, h ) );
-
- disposehandle ( h );
-
*dirid = roottable;
goto tagandexit;
@@ -331,32 +325,32 @@
}
if ( ( *fsfolder ).name == NULL ) {
-
+
*dirid = (*fsfolder).parID;
goto tagandexit;
}
-
+
if (!claylookupvalue (fsfolder, &val, &hnode))
return (false);
-
- if (flinmemory) {
+ if (flinmemory) {
+
hdlexternalvariable hv = (hdlexternalvariable) val.data.externalvalue;
if (!(**hv).flinmemory)
return (false);
}
-
+
if (!tablevaltotable (val, dirid, hnode))
return (false);
-
+
tagandexit:
return (true);
- } /*claygetfolder*/
+ } // claygetfolder
boolean claygetinmemorydirid ( const tybrowserspec *fsfolder, tybrowserdir *dirid ) {
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langevaluate.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langevaluate.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langevaluate.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -1960,9 +1960,12 @@
#if lazythis_optimization
+
static int ctdeferredthis = 0;
+
#endif
+
boolean evaluatelist (hdltreenode hfirst, tyvaluerecord *val) {
//
@@ -1977,7 +1980,7 @@
// runtime stack, and releasing it before we exit. the global is reset to
// nil, so that it has to be reset on every use.
//
- // 2007-02-23 creedon: support for long odb item names and file paths
+ // 2007-06-23 creedon: support for long odb item names and file paths
//
// 2001-11-13 dmb: try lazy with evaluation
//
@@ -2078,6 +2081,7 @@
#if lazythis_optimization
++ctdeferredthis;
+
#else
if ( langgetthisaddress ( &hthis, &handleThis ) )
@@ -2093,7 +2097,7 @@
if ( setheapvalue ( tryerror, stringvaluetype, &errorval ) ) {
- /* register */ Handle h;
+ Handle h;
newfilledhandle ( nametryerrorval + 1, stringlength ( nametryerrorval ), &h );
@@ -2225,7 +2229,7 @@
}
- if (languserescaped (true)) /*user pressed cmd-period, unwind recursion -- quickly*/
+ if (languserescaped (true)) // user pressed cmd-period, unwind recursion -- quickly
goto exit;
flReturn = true; // fell through the bottom of the list
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langexternal.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langexternal.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langexternal.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -215,6 +215,7 @@
return (nil);
return ((**hv).hdatabase);
+
} /*langexternalgetdatabase*/
@@ -1125,14 +1126,15 @@
5.0.2b12 dmb: new routine
*/
- hdlexternalhandle h = (hdlexternalhandle) (*v1).data.externalvalue;
Handle x;
boolean fl;
+ hdlexternalhandle h = (hdlexternalhandle) (*v1).data.externalvalue;
switch ((**h).id) {
case idoutlineprocessor:
case idscriptprocessor:
+
if (!opverbcopyvalue (h, &h))
return (false);
@@ -1141,6 +1143,7 @@
return (true);
default:
+
if (!langpackvalue (*v1, &x, HNoNode))
return (false);
@@ -1150,6 +1153,7 @@
return (fl);
}
+
} /*langexternalcopyvalue*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langhash.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langhash.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langhash.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -851,16 +851,17 @@
void dirtyhashtable (hdlhashtable ht) {
-
+
(**ht).fldirty = true;
(**ht).timelastsave = timenow ();
} /*dirtyhashtable*/
-
-static short smashhashtable (hdlhashtable htable, boolean fldisk, boolean flcallback) {
+static short smashhashtable ( hdlhashtable htable, boolean fldisk,
+ boolean flcallback ) {
+
//
// 2007-02-23 creedon: support for long odb item names and file paths
//
@@ -872,57 +873,51 @@
register hdlhashnode nomad, nextnomad;
register hdlhashtable ht = htable;
register short i;
-
+
Handle h;
short ctdisposed = 0;
- if (ht == nil) /*easy to dispose of nil table*/
+ if (ht == nil) // easy to dispose of nil table
return (0);
+
+ (**ht).hfirstsort = nil; // disconnect now so table is valid during
+ // disposal
- (**ht).hfirstsort = nil; /*disconnect now so table is valid during disposal*/
-
for (i = 0; i < ctbuckets; i++) {
-
+
nomad = (**ht).hashbucket [i];
- (**ht).hashbucket [i] = nil; /*disconnect list so table is valid during disposal*/
+ (**ht).hashbucket [i] = nil; // disconnect list so table is valid
+ // during disposal
while (nomad != nil) {
-
+
nextnomad = (**nomad).hashlink;
if (flcallback)
gethashkey (nomad, &h);
-
+
if (flcallback)
langsymbolunlinking (ht, nomad);
-
+
disposehashnode (ht, nomad, true, fldisk);
if (flcallback)
langsymboldeleted (ht, h);
-
+
++ctdisposed;
- if ( ctdisposed == 59 ) {
-
- boolean fl;
-
- fl = true;
-
- }
-
nomad = nextnomad;
- } /*while*/
+ } // while
- } /*for*/
-
+ } // for
+
dirtyhashtable (ht);
-
+
return (ctdisposed);
- } /*smashhashtable*/
+ } // smashhashtable
short emptyhashtable (hdlhashtable htable, boolean fldisk) {
@@ -1001,6 +996,7 @@
disposehashnode (nomad, true /%fldisposevalue%/, fldisk);
nomad = nextnomad;
+
}
}
*/
@@ -1758,9 +1754,10 @@
// items
//
// 5.0.1b1 dmb: the b17 change broke stuff, because the object may be in
- // another table's temp stack. Our caller is responsible for exempting
- // anything assinged into a table. we just need to make sure that the
- // fltmpstack flag is clear for _any_ object we assign to a hashnode
+ // another table's temp stack. Our caller is responsible for
+ // exempting anything assinged into a table. we just need to
+ // make sure that the fltmpstack flag is clear
+ // for _any_ object we assign to a hashnode
//
// 5.0b17 dmb: if we're assigning a tmp external, claim the data like a
// normal tmp. don't copy the data, clean fltmpdata instead.
@@ -1775,9 +1772,9 @@
// side effect of hiding an error condition unexpectedly.
//
+ boolean fllocal = (**currenthashtable).fllocaltable;
hdlhashnode hnode, hprev;
tyvaluerecord existingval;
- boolean fllocal = (**currenthashtable).fllocaltable;
/*
fllangerror = false;
@@ -2108,8 +2105,8 @@
be examining strings values must handle this. (currently there are no such callers.)
*/
- /* register */ hdlhashnode x;
- /* register */ short i;
+ register hdlhashnode x;
+ register short i;
for (i = 0; i < ctbuckets; i++) {
@@ -4157,10 +4154,9 @@
boolean gethashkey ( hdlhashnode hhn, Handle *handleHashKey ) {
//
- // 2007-02-23 creedon: created, used to be a macro
+ // 2007-04-13 creedon: created, used to be a macro
//
- Handle h;
long length;
short s;
@@ -4168,13 +4164,11 @@
length = ( long ) s;
- if ( ! newhandle ( length, &h ) )
+ if ( ! newhandle ( length, handleHashKey ) )
return ( false );
- moveleft ( ( **hhn ).hashkey + sizeof ( short ), *h, length );
+ moveleft ( ( **hhn ).hashkey + sizeof ( short ), **handleHashKey, length );
- *handleHashKey = h;
-
return ( true );
} // gethashkey
@@ -4186,15 +4180,6 @@
// 2007-02-23 creedon: created
//
- Handle h1;
-
- newtexthandle ( BIGSTRING ( "\x08" "#ftpSite" ), &h1 );
-
- if ( equalhandles ( h, h1 ) )
- disposehandle ( h1 );
-
- disposehandle ( h1 );
-
long length = gethandlesize ( h );
short sLength = ( short ) length;
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c 2007-06-18 18:00:08 UTC (rev 1698)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langhtml.c 2007-06-23 19:41:49 UTC (rev 1699)
@@ -825,24 +825,24 @@
if ( ! newtexthandle ( pref, &h ) )
return ( false );
- if (!htmlgetpref (pmi, h, &val)) {
+ if ( ! htmlgetpref ( pmi, h, &val ) ) {
disposehandle ( h );
- return (false);
+ return ( false );
}
disposehandle ( h );
- if (!coercetoboolean (&val))
- return (false);
+ if ( ! coercetoboolean ( &val ) )
+ return ( false );
*flpref = val.data.flvalue;
- return (true);
+ return ( true );
- } /*htmlgetbooleanpref*/
+ } // htmlgetbooleanpref
static boolean htmlgetstringpref (typrocessmacrosinfo *pmi, const Handle pref, bigstring bspref) {
@@ -887,7 +887,7 @@
} // htmlGetStringPreferenceBigstring
-static boolean htmlrefglossary (typrocessmacrosinfo *pmi, Handle hreference, bigstring perrorstring, Handle *hresult) {
+static boolean htmlrefglossary ( typrocessmacrosinfo *pmi, Handle hreference, bigstring perrorstring, Handle *hresult ) {
#pragma unused (pmi)
@@ -912,19 +912,19 @@
ptrvoid saveerrorstring = langcallbacks.errormessagerefcon;
tyvaluerecord vparams, vresult;
- setheapvalue (hreference, stringvaluetype, &vparams);
+ setheapvalue ( hreference, stringvaluetype, &vparams );
- if (!coercetolist (&vparams, listvaluetype))
- return (false);
-
+ if ( ! coercetolist ( &vparams, listvaluetype ) )
+ return ( false );
+
langcallbacks.errormessagecallback = &htmlcallbackerror;
langcallbacks.errormessagerefcon = perrorstring;
- if ( ! newtexthandle ( BIGSTRING ("\x10" "html.refglossary"), &h ) )
+ if ( ! newtexthandle ( BIGSTRING ( "\x10" "html.refglossary" ), &h ) )
return ( false );
- fl = langrunscript ( h, &vparams, nil, &vresult) && strongcoercetostring (&vresult);
+ fl = langrunscript ( h, &vparams, nil, &vresult ) && strongcoercetostring ( &vresult );
disposehandle ( h );
@@ -934,17 +934,18 @@
fllangerror = false;
- if (fl) {
+ if ( fl ) {
+
+ exemptfromtmpstack ( &vresult );
- exemptfromtmpstack (&vresult);
-
*hresult = vresult.data.stringvalue;
}
+
+ return ( fl );
- return (fl);
+ /*
- /*
// local (adrpagetable = html.data.adrPageTable);
// local (adrobject = adrpagetable^.adrobject);
// local (adrparent = parentOf (adrobject^));
@@ -1037,8 +1038,6 @@
if (!pushtexthandle ("\x01" "|", *hresult))
return (false);
-
-
case scriptvaluetype:
break;
@@ -1048,11 +1047,12 @@
}
// return (frontTextScriptCall ('refg', term, hresult, errorstring));
+
*/
- } /*htmlrefglossary*/
-
+ } // htmlrefglossary
+
static boolean htmlcleanforexport (Handle x) {
/*
@@ -1126,9 +1126,11 @@
}
closehandlestream (&s);
+
#endif
return (true);
+
} /*htmlcleanforexport*/
@@ -1137,10 +1139,11 @@
disposehashtable ((*pmi).hmacrocontext, false);
(*pmi).hmacrocontext = nil;
+
} /*htmldisposemacrocontext*/
-static boolean htmlbuildmacrocontext (typrocessmacrosinfo *pmi) {
+static boolean htmlbuildmacrocontext ( typrocessmacrosinfo *pmi ) {
//
// 2007-02-23 creedon: support for long odb item names and file paths
@@ -1156,74 +1159,83 @@
hdlhashtable hcontext, hstandardmacros, ht, htools, husermacros;
tyvaluerecord val;
- if ((*pmi).hmacrocontext != nil)
- return (true);
+ if ( ( *pmi ).hmacrocontext != nil )
+ return ( true );
// find macros tables
- if (!langfastaddresstotable (builtinstable, NULL, str_standardmacros, &hstandardmacros))
- return (false);
+ if ( ! langfastaddresstotable ( builtinstable, NULL, str_standardmacros, &hstandardmacros ) )
+ return ( false );
- if (!langfastaddresstotable (roottable, NULL, str_usermacros, &husermacros))
- return (false);
+ if ( ! langfastaddresstotable ( roottable, NULL, str_usermacros, &husermacros ) )
+ return ( false );
- if (!newhashtable (&hcontext)) /*new table for the function when it runs*/
- return (false);
+ if ( ! newhashtable ( &hcontext ) ) // new table for the function when it runs
+ return ( false );
- (**hcontext).fllocaltable = true;
+ ( **hcontext ).fllocaltable = true;
- (**hcontext).lexicalrefcon = 0L; /*'with' gets global scope*/
+ ( **hcontext ).lexicalrefcon = 0L; // 'with' gets global scope
// local (adrpagetable = html.data.adrPageTable)
+
if ( ! findinparenttable ( ( *pmi ).hpagetable, &ht, &h ) )
goto error;
- if (!setaddressvalue (ht, h, &val))
+ if ( ! setaddressvalue ( ht, h, &val ) ) {
+
+ disposehandle ( h );
+
goto error;
- if (!hashtableassignstring (hcontext, BIGSTRING ("\x0c" "adrPageTable"), val))
+ }
+
+ disposehandle ( h );
+
+ if ( ! hashtableassignstring ( hcontext, BIGSTRING ( "\x0c" "adrPageTable" ), val ) )
goto error;
- exemptfromtmpstack (&val);
+ exemptfromtmpstack ( &val );
// with html.data.adrPageTable^, html.data.standardMacros, user.html.macros, toolTableAdr^ {
- if (!langpushwithtable (hcontext, (*pmi).hpagetable))
+
+ if ( ! langpushwithtable ( hcontext, ( *pmi ).hpagetable ) )
goto error;
- if (!langpushwithtable (hcontext, hstandardmacros))
+ if ( ! langpushwithtable ( hcontext, hstandardmacros ) )
goto error;
- if (!langpushwithtable (hcontext, husermacros))
+ if ( ! langpushwithtable ( hcontext, husermacros ) )
goto error;
if ( hashTableLookupBigstring ( ( *pmi ).hpagetable, str_tools, &val, &hnode ) &&
- (val.valuetype == addressvaluetype) &&
+ ( val.valuetype == addressvaluetype ) &&
getaddressvalue ( val, &htools, &handleTools ) &&
- hashtablelookup (htools, handleTools, &val, &hnode) &&
- tablevaltotable (val, &htools, hnode))
+ hashtablelookup ( htools, handleTools, &val, &hnode ) &&
+ tablevaltotable ( val, &htools, hnode ) )
- if (!langpushwithtable (hcontext, htools))
+ if ( ! langpushwithtable ( hcontext, htools ) )
goto error;
disposehandle ( handleTools );
- (*pmi).hmacrocontext = hcontext;
+ ( *pmi ).hmacrocontext = hcontext;
- return (true);
+ return ( true );
error:
disposehandle ( handleTools );
- disposehashtable (hcontext, false);
+ disposehashtable ( hcontext, false );
- return (false);
+ return ( false );
- } /*htmlbuildmacrocontext*/
+ } // htmlbuildmacrocontext
static boolean htmlrunmacro (typrocessmacrosinfo *pmi, Handle macro, bigstring perrorstring, Handle *hresult) {
-
+
/*
run the macro, consuming it. return the result in hresult, which our caller
must dispose. on error, return the error text in perrorstring.
@@ -1265,7 +1277,7 @@
unchainhashtable ();
if (fl) {
-
+
Handle h = val.data.stringvalue;
if ((*pmi).flexpandglossaryitems) {
@@ -1276,35 +1288,39 @@
// macroResult = html.refGlossary (macroResult)}};
if ((*h) [0] == '"' && (*h) [gethandlesize (h) - 1] == '"') {
-
+
pullfromhandle (h, 0, 1, nil);
popfromhandle (h, 1, nil);
return (htmlrefglossary (pmi, h, perrorstring, hresult));
+
}
}
+
+ *hresult = h;
- *hresult = h;
}
else
if (stringlength (perrorstring) > 0 && ingoodthread ()) { //6.2b6 AR
+
+ Handle herror;
- Handle herror;
-
- if (newtexthandle (perrorstring, &herror)) {
+ if ( newtexthandle ( perrorstring, &herror ) ) {
+
+ htmlcleanforexport ( herror );
- htmlcleanforexport (herror);
+ texthandletostring ( herror, perrorstring );
- texthandletostring (herror, perrorstring);
-
- disposehandle (herror);
+ disposehandle ( herror );
+
}
}
else
*hresult = nil;
+
+ return (fl);
- return (fl);
/*
else {
local (errorString = html.cleanForExport (tryError));
@@ -1329,7 +1345,8 @@
scriptError (errorString)}}
*/
//return (frontTextScriptCall ('dosc', macro, hresult, errorstring));
- } /*htmlrunmacro*/
+
+ } // htmlrunmacro
static boolean htmlreportmacroerror (typrocessmacrosinfo *pmi, Handle macro, bigstring perrorstring) {
@@ -2345,301 +2362,304 @@
#ifdef version5orgreater
-static boolean iso8859encode (handlestream *s, hdlhashtable hiso8859usermap) {
+ static boolean iso8859encode (handlestream *s, hdlhashtable hiso8859usermap) {
- //
- // 2007-02-23 creedon: support for long odb item names and file paths
- //
- // 5.0.2b16 dmb: backup after replacement, so we don't miss next char
- //
- // 5.0.2b14 dmb: take a handlestream, not a Handle
- //
- // 4.1b13 dmb: fixed heap-trashing off-by-one error in text replacement code
- //
- // 4.1b4 dmb: use user preferences for mapping, if table exists. for extra
- // speed, don't even try to map characters < ascii 128
- //
-
- #define lentext ((*s).eof)
- #define ixtext ((*s).pos)
- Handle htext = (*s).data;
- unsigned char ch;
- Str255 bs;
- tyvaluerecord val;
- hdlhashnode hnode;
-
-
- #ifndef version5orgreater
- hdlhashtable hiso8859usermap = nil;
+ //
+ // 2007-02-23 creedon: support for long odb item names and file paths
+ //
+ // 5.0.2b16 dmb: backup after replacement, so we don't miss next char
+ //
+ // 5.0.2b14 dmb: take a handlestream, not a Handle
+ //
+ // 4.1b13 dmb: fixed heap-trashing off-by-one error in text replacement
+ // code
+ //
+ // 4.1b4 dmb: use user preferences for mapping, if table exists. for extra
+ // speed, don't even try to map characters < ascii 128
+ //
- if (getsystemtablescript (iduseriso8859map, bs)) {
+ #define lentext ((*s).eof)
+ #define ixtext ((*s).pos)
+ Handle htext = (*s).data;
+ unsigned char ch;
+ Str255 bs;
+ tyvaluerecord val;
+ hdlhashnode hnode;
+
+ #ifndef version5orgreater
+
+ hdlhashtable hiso8859usermap = nil;
- pushstring (BIGSTRING ("\x08" ".[\"128\"]"), bs); /*refer to 1st entry in table*/
+ if (getsystemtablescript (iduseriso8859map, bs)) {
+
+ pushstring (BIGSTRING ("\x08" ".[\"128\"]"), bs); /*refer to 1st entry in table*/
+
+ disablelangerror ();
+
+ if (langexpandtodotparams (bs, &hiso8859usermap, bs))
+ ; /*map being non-nil is our flag*/
+
+ enablelangerror ();
+
+ }
+ #endif
+
+ if (hiso8859usermap != nil)
+ pushhashtable (hiso8859usermap);
- disablelangerror ();
-
- if (langexpandtodotparams (bs, &hiso8859usermap, bs))
- ; /*map being non-nil is our flag*/
-
- enablelangerror ();
-
- }
- #endif
-
- if (hiso8859usermap != nil)
- pushhashtable (hiso8859usermap);
-
- for (ixtext = 0; ixtext < lentext; ++ixtext) {
-
- ch = (*htext) [ixtext];
-
- if (ch <= 127)
- continue;
+ for (ixtext = 0; ixtext < lentext; ++ixtext) {
- if (hiso8859usermap != nil) {
+ ch = (*htext) [ixtext];
- Handle h;
+ if (ch <= 127)
+ continue;
+
+ if (hiso8859usermap != nil) {
- numbertostring ((long) ch, bs);
-
- if ( ! newtexthandle ( bs, &h ) )
- return ( false );
+ Handle h;
- if (!hashlookup ( h, &val, &hnode) || val.valuetype != stringvaluetype) {
-
+ numbertostring ((long) ch, bs);
+
+ if ( ! newtexthandle ( bs, &h ) )
+ return ( false );
+
+ if (!hashlookup ( h, &val, &hnode) || val.valuetype != stringvaluetype) {
+
+ disposehandle ( h );
+
+ continue;
+
+ }
+
disposehandle ( h );
- continue;
+ pullstringvalue (&val, bs);
}
+ else {
+
+ if (iso8859table [ch] == 0) /*normal char, doesn't need processing*/
+ continue;
+
+ /*encode the character*/
- disposehandle ( h );
+ copyctopstring ((char *)(iso8859table [ch]), bs); // 3/26/97 dmb: it's a c string now
+
+ }
+
+ if (!mergehandlestreamstring (s, 1, bs))
+ return (false);
+
+ --ixtext; // back up, so we can move ahead
+ } /*while*/
- pullstringvalue (&val, bs);
+ if (hiso8859usermap != nil)
+ pophashtable ();
- }
- else {
+ return (true);
- if (iso8859table [ch] == 0) /*normal char, doesn't need processing*/
- continue;
-
- /*encode the character*/
-
- copyctopstring ((char *)(iso8859table [ch]), bs); // 3/26/97 dmb: it's a c string now
-
- }
+ #undef lentext
+ #undef ixtext
- if (!mergehandlestreamstring (s, 1, bs))
- return (false);
-
- --ixtext; // back up, so we can move ahead
- } /*while*/
-
- if (hiso8859usermap != nil)
- pophashtable ();
-
- return (true);
-
- #undef lentext
- #undef ixtext
-
- } /*iso8859encode*/
+ } /*iso8859encode*/
-boolean processhtmlmacrosverb (hdltreenode hp1, tyvaluerecord *vreturned) {
-
- /*
- 5.0.2b13 dmb: create handlestream here, and use for both processtext and autoparagraphs
-
- 5.0.2b14 dmb: suck the whole damn thing into the kernel, changing our API
-
- on processMacros (s, plainprocessing = false) {
+ boolean processhtmlmacrosverb (hdltreenode hp1, tyvaluerecord *vreturned) {
- 6.1b17 AR: We were doing a lot of superfluous work to determine the page table,
- some of it even causing crashes. Calling getoptionalpagetableavalue
- is enough.
- */
-
- typrocessmacrosinfo pageinfo;
- boolean flplainprocessing = false;
- Handle htext = nil;
- handlestream s;
-
- // get all of the prefs and tables that we need
-
- clearbytes (&pageinfo, sizeof (pageinfo));
-/*
- if (!htmlgetpagetable (&pageinfo.hpagetable) && !htmlgetdefaultpagetable (&pageinfo.hpagetable))
- return (false);
-*/
- if (!htmlgetprefstable (&pageinfo.huserprefs))
- return (false);
-
- if (langgetparamcount (hp1) > 1) {
+ /*
+ 5.0.2b13 dmb: create handlestream here, and use for both processtext and autoparagraphs
- if (!getbooleanvalue (hp1, 2, &flplainprocessing))
- return (false);
- }
-/*
- if (langgetparamcount (hp1) > 2) {
+ 5.0.2b14 dmb: suck the whole damn thing into the kernel, changing our API
- flnextparamislast = true;
+ on processMacros (s, plainprocessing = false) {
+
+ 6.1b17 AR: We were doing a lot of superfluous work to determine the page table,
+ some of it even causing crashes. Calling getoptionalpagetableavalue
+ is enough.
+ */
- if (!gettablevalue (hp1, 3, &pageinfo.hpagetable))
- return (false);
- }
-*/
- if (!getoptionalpagetablevalue (hp1, 3, &pageinfo.hpagetable))
- return (false);
-
- if (flplainprocessing) {
-
- pageinfo.flautoparagraphs = false;
+ typrocessmacrosinfo pageinfo;
+ boolean flplainprocessing = false;
+ Handle htext = nil;
+ handlestream s;
- pageinfo.flclaycompatibility = false;
+ // get all of the prefs and tables that we need
- pageinfo.flactiveurls = false;
- }
- else {
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0e" "autoParagraphs"), &pageinfo.flautoparagraphs))
+ clearbytes (&pageinfo, sizeof (pageinfo));
+ /*
+ if (!htmlgetpagetable (&pageinfo.hpagetable) && !htmlgetdefaultpagetable (&pageinfo.hpagetable))
return (false);
+ */
+ if (!htmlgetprefstable (&pageinfo.huserprefs))
+ return (false);
+
+ if (langgetparamcount (hp1) > 1) {
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0a" "activeURLs"), &pageinfo.flactiveurls))
+ if (!getbooleanvalue (hp1, 2, &flplainprocessing))
+ return (false);
+ }
+ /*
+ if (langgetparamcount (hp1) > 2) {
+
+ flnextparamislast = true;
+
+ if (!gettablevalue (hp1, 3, &pageinfo.hpagetable))
+ return (false);
+ }
+ */
+ if (!getoptionalpagetablevalue (hp1, 3, &pageinfo.hpagetable))
return (false);
+
+ if (flplainprocessing) {
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x11" "clayCompatibility"), &pageinfo.flclaycompatibility))
+ pageinfo.flautoparagraphs = false;
+
+ pageinfo.flclaycompatibility = false;
+
+ pageinfo.flactiveurls = false;
+
+ }
+ else {
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0e" "autoParagraphs"), &pageinfo.flautoparagraphs))
+ return (false);
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0a" "activeURLs"), &pageinfo.flactiveurls))
+ return (false);
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x11" "clayCompatibility"), &pageinfo.flclaycompatibility))
+ return (false);
+ }
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0d" "processMacros"), &pageinfo.flprocessmacros))
return (false);
- }
-
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x0d" "processMacros"), &pageinfo.flprocessmacros))
- return (false);
-
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x13" "expandGlossaryItems"), &pageinfo.flexpandglossaryitems))
- return (false);
-
- if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x09" "isoFilter"), &pageinfo.flisofilter))
- return (false);
-
- // get the text and process it!
-
- if (!getexempttextvalue (hp1, 1, &htext))
- return (false);
-
- openhandlestream (htext, &s);
-
- if (!processhtmltext (&s, &pageinfo))
- goto error;
-
- htmldisposemacrocontext (&pageinfo);
-
- if (pageinfo.flautoparagraphs) {
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x13" "expandGlossaryItems"), &pageinfo.flexpandglossaryitems))
+ return (false);
+
+ if (!htmlgetbooleanpref (&pageinfo, BIGSTRING ("\x09" "isoFilter"), &pageinfo.flisofilter))
+ return (false);
+
+ // get the text and process it!
- if (!autoparagraphs (&s))
+ if (!getexempttextvalue (hp1, 1, &htext))
+ return (false);
+
+ openhandlestream (htext, &s);
+
+ if (!processhtmltext (&s, &pageinfo))
goto error;
- }
-
- if (pageinfo.flisofilter) {
+
+ htmldisposemacrocontext (&pageinfo);
- hdlhashtable hisomap;
+ if (pageinfo.flautoparagraphs) {
+
+ if (!autoparagraphs (&s))
+ goto error;
+ }
+
+ if (pageinfo.flisofilter) {
- if (!langfastaddresstotable (builtinstable, NULL, str_iso8859map, &hisomap))
- goto error;
+ hdlhashtable hisomap;
+
+ if (!langfastaddresstotable (builtinstable, NULL, str_iso8859map, &hisomap))
+ goto error;
+
+ if (!iso8859encode (&s, hisomap))
+ goto error;
+ }
+
+ closehandlestream (&s);
- if (!iso8859encode (&s, hisomap))
- goto error;
- }
-
- closehandlestream (&s);
-
- return (setheapvalue (htext, stringvaluetype, vreturned));
-
- error: {
+ return (setheapvalue (htext, stringvaluetype, vreturned));
- htmldisposemacrocontext (&pageinfo);
+ error:
- disposehandle (htext);
+ htmldisposemacrocontext (&pageinfo);
+
+ disposehandle (htext);
+
+ return (false);
+
+ } /*processhtmlmacrosverb*/
- return (false);
- }
- } /*processhtmlmacrosverb*/
-
#else
-boolean processhtmlmacrosverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
+ boolean processhtmlmacrosverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
- /*
- 5.0.2b13 dmb: create handlestream here, and use for both processtext and autoparagraphs
- */
-
- Handle htext = nil;
- boolean flautoparagraphs, flactiveurls, claycompatibity;
- tyvaluerecord callbackval;
- tyaddress callback;
- ptraddress savecallback;
- handlestream s;
-
- if (!getbooleanvalue (hparam1, 2, &flautoparagraphs))
- return (false);
-
- if (!getbooleanvalue (hparam1, 3, &flactiveurls))
- return (false);
-
- if (!getbooleanvalue (hparam1, 4, &claycompatibity))
- return (false);
-
- flnextparamislast = true;
-
- #if version42orgreater
-
- if (!getaddressparam (hparam1, 5, &callbackval))
- return (false);
-
- if (!getaddressvalue (callbackval, &callback.ht, callback.bs))
- return (false);
-
- savecallback = callbackscript;
-
- callbackscript = &callback;
-
- #else
-
- if (!getbinaryvalue (hparam1, 5, true, &osaval.data.binaryvalue))
- return (false);
-
- #endif
-
- if (!getexempttextvalue (hparam1, 1, &htext))
- goto error;
-
- openhandlestream (htext, &s);
-
- if (!processtext (&s, flactiveurls, claycompatibity))
- goto error;
+ /*
+ 5.0.2b13 dmb: create handlestream here, and use for both processtext and autoparagraphs
+ */
- if (flautoparagraphs) {
+ Handle htext = nil;
+ boolean flautoparagraphs, flactiveurls, claycompatibity;
+ tyvaluerecord callbackval;
+ tyaddress callback;
+ ptraddress savecallback;
+ handlestream s;
- if (!autoparagraphs (&s))
+ if (!getbooleanvalue (hparam1, 2, &flautoparagraphs))
+ return (false);
+
+ if (!getbooleanvalue (hparam1, 3, &flactiveurls))
+ return (false);
+
+ if (!getbooleanvalue (hparam1, 4, &claycompatibity))
+ return (false);
+
+ flnextparamislast = true;
+
+ #if version42orgreater
+
+ if (!getaddressparam (hparam1, 5, &callbackval))
+ return (false);
+
+ if (!getaddressvalue (callbackval, &callback.ht, callback.bs))
+ return (false);
+
+ savecallback = callbackscript;
+
+ callbackscript = &callback;
+
+ #else
+
+ if (!getbinaryvalue (hparam1, 5, true, &osaval.data.binaryvalue))
+ return (false);
+
+ #endif
+
+ if (!getexempttextvalue (hparam1, 1, &htext))
goto error;
- }
-
- closehandlestream (&s);
-
- callbackscript = savecallback;
-
- return (setheapvalue (htext, stringvaluetype, vreturned));
-
- error: {
+
+ openhandlestream (htext, &s);
+ if (!processtext (&s, flactiveurls, claycompatibity))
+ goto error;
+
+ if (flautoparagraphs) {
+
+ if (!autoparagraphs (&s))
+ goto error;
+ }
+
+ closehandlestream (&s);
+
callbackscript = savecallback;
- disposehandle (htext);
+ return (setheapvalue (htext, stringvaluetype, vreturned));
- return (false);
- }
- } /*processhtmlmacrosverb*/
+ error:
+
+ callbackscript = savecallback;
+
+ disposehandle (htext);
+
+ return (false);
+
+ } /*processhtmlmacrosverb*/
+
+ #endif
-#endif
-
#ifdef MACVERSION
#pragma mark === stringOps ucmd ===
#endif
@@ -2833,152 +2853,162 @@
6.1b7 AR: Bug fix: We no longer depend on the field value
to not contain "=" signs.
*/
-
+
#ifdef oplanglists
+
Handle htext, hreturnedtext = nil, hfieldname, hfieldvalue;
hdllistrecord list = nil;
short fieldnum = 1;
long lenfield, lenfieldname;
-
+
flnextparamislast = true;
if (!getexempttextvalue (hparam1, 1, &htext))
return (false);
-
+
if (!opnewlist (&list, false))
goto error;
+
+ while (true) {
- while (true) {
-
if (!nthfieldhandle (htext, '&', fieldnum++, &hreturnedtext))
break;
-
+
lenfield = gethandlesize (hreturnedtext);
if (lenfield == 0) { //ran out of fields
-
+
disposehandle (hreturnedtext);
break;
+
}
-
+
if (!nthfieldhandle (hreturnedtext, '=', 1, &hfieldname))
goto error;
+
+ lenfieldname = gethandlesize (hfieldname);
- lenfieldname = gethandlesize (hfieldname);
-
decodehandle (hfieldname);
if (!langpushlisttext (list, hfieldname))
goto error;
-
+
/* if (!nthfieldhandle (hreturnedtext, '=', 2, &hfieldvalue))
goto error;
*/
if (lenfieldname < lenfield)
lenfieldname++;
-
+
if (!loadhandleremains (lenfieldname, hreturnedtext, &hfieldvalue))
goto error;
+
+ decodehandle (hfieldvalue);
- decodehandle (hfieldvalue);
-
if (!langpushlisttext (list, hfieldvalue))
goto error;
-
+
disposehandle (hreturnedtext);
+
}
-
+
disposehandle (htext);
return (setheapvalue ((Handle) list, listvaluetype, vreturned));
-
- error: {
+ error:
+
disposehandle (hreturnedtext);
disposehandle (htext);
opdisposelist (list);
-
+
return (false);
- }
+
#else
+
Handle htext, hreturnedtext = nil, hfieldname, hfieldvalue;
AEDescList list = {typeNull, nil};
short fieldnum = 1, ixlist = 1;
-
+
flnextparamislast = true;
if (!getexempttextvalue (hparam1, 1, &htext))
return (false);
-
+
if (!IACnewlist (&list))
goto error;
+
+ while (true) {
- while (true) {
-
if (!nthfieldhandle (htext, '&', fieldnum++, &hreturnedtext))
break;
+
+ if (gethandlesize (hreturnedtext) == 0) { //ran out of fields
- if (gethandlesize (hreturnedtext) == 0) { //ran out of fields
-
disposehandle (hreturnedtext);
break;
+
}
-
+
if (!nthfieldhandle (hreturnedtext, '=', 1, &hfieldname))
goto error;
-
+
decodehandle (hfieldname);
if (!IACpushtextitem (&list, hfieldname, ixlist++))
goto error;
-
+
if (!nthfieldhandle (hreturnedtext, '=', 2, &hfieldvalue))
goto error;
-
+
decodehandle (hfieldvalue);
if (!IACpushtextitem (&list, hfieldvalue, ixlist++))
goto error;
+
+ disposehandle (hreturnedtext);
- disposehandle (hreturnedtext);
}
-
+
disposehandle (htext);
#if TARGET_API_MAC_CARBON == 1
{
+
Handle h;
copydatahandle (&list, &h);
- return (setheapvalue (h, listvaluetype, vreturned));
+ return (setheapvalue (h, listvaluetype, vreturned));
+
}
-
+
#else
return (setheapvalue (list.dataHandle, listvaluetype, vreturned));
-
+
#endif
- error: {
+ error:
disposehandle (hreturnedtext);
disposehandle (htext);
AEDisposeDesc (&list); // 5.0d12 dmb
-
+
if (!fllangerror)
oserror (IACglobals.errorcode);
-
+
return (false);
+
}
#endif
+
} /*parseargsverb*/
@@ -3363,11 +3393,13 @@
//
// on addItemToPageTable (adr) { \xC7adr points to an attribute
//
+
+ //
// 2007-02-23 creedon: support for long odb item names and file paths
//
- Handle lowername, name;
- boolean fl;
+ Handle lowername = nil, name = nil;
+ boolean fl, flReturn = false;
hdldatabaserecord hdb;
tyaddress adr;
tyvaluerecord val;
@@ -3385,7 +3417,7 @@
if ( *name [ 0 ] == '#')
pullfromhandle ( name, 0, 1, NULL );
-
+
// if not defined (adrpagetable^.[name]) {
if (!hashtablesymbolexists (hpagetable, name)) {
@@ -3422,12 +3454,14 @@
hdlhashnode hn;
if (langexternalvaltotable (val, &ht, hnode)) { // should never fail
-
+
for (hn = (**ht).hfirstsort; hn != nil; hn = (**hn).sortedlink)
if (!additemtopagetable (ht, hn, hpagetable))
goto exit;
+
+ flReturn = true;
- return (true);
+ goto exit;
}
}
@@ -3438,32 +3472,32 @@
if (!langassignaddressvalue (hpagetable, name, &adr))
goto exit;
+
+ break;
- break;
-
default:
hdb = tablegetdatabase (htable);
-
+
if (hdb)
dbpushdatabase (hdb);
-
+
fl = copyvaluerecord (val, &val);
-
+
if (hdb)
dbpopdatabase ();
-
+
if (!fl || !strongcoercetostring (&val))
goto exit;
-
+
if (!hashtableassign (hpagetable, name, val))
goto exit;
-
+
exemptfromtmpstack (&val);
break;
}
-
+
// if lowername == "ftpsite" { // dmb: move this into buildpagetableverb
// adrpagetable^.subdirectoryPath = subdirpath;
// adrpagetable^.adrSiteRootTable = nomad}; \xC74.2
@@ -3474,23 +3508,28 @@
// adrpagetable^.indirectTemplate = false;
if ( textHandleEqualsBigstring (lowername, str_template, false )) {
+
+ if ((objecttype == wordvaluetype) || (objecttype == outlinevaluetype)) {
- if ((objecttype == wordvaluetype) || (objecttype == outlinevaluetype)) {
+ if ( langAssignBooleanValueBigstring ( hpagetable, str_indirecttemplate, false ) ) {
- if ( ! langAssignBooleanValueBigstring ( hpagetable, str_indirecttemplate, false ) )
- return (false);
+ flReturn = true;
+ goto exit;
+
+ }
+
// if objecttype == outlinetype {
// adrpagetable^.[name] = adr^}}}};
if (objecttype == outlinevaluetype) {
if (!copyvaluerecord (val, &val))
- return (false);
-
+ goto exit;
+
if (!hashtableassign (hpagetable, name, val))
- return (false);
-
+ goto exit;
+
exemptfromtmpstack (&val);
}
@@ -3498,16 +3537,16 @@
}
}
- return (true);
+ flReturn = true;
exit:
disposehandle ( lowername );
disposehandle ( name );
- return ( false );
+ return ( flReturn );
- } /*additemtopagetable*/
+ } // additemtopagetable
static boolean buildpagetableverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
@@ -3515,11 +3554,13 @@
//
// on buildTable (adrobject, adrpagetable) {
//
- // 2007-02-23 creedon: support for long odb item names and file paths
+
//
+ // 2007-06-20 creedon: support for long odb item names and file paths
+ //
- Handle name, subdirpath;
- boolean fl;
+ Handle name = NULL, subdirpath = NULL;
+ boolean fl = false;
hdlhashnode hn;
hdlhashtable hpagetable, nomadtable;
tyaddress nomad;
@@ -3527,7 +3568,7 @@
#ifdef MACVERSION
byte pc = ':';
-
+
#else
byte pc = '\\';
@@ -3536,21 +3577,21 @@
if (!getvarparam (hparam1, 1, &nomad.ht, &nomad.h))
return (false);
-
+
flnextparamislast = true;
if (!gettablevalue (hparam1, 2, &hpagetable))
return (false);
-
+
// local (nomad = parentOf (adrobject^), subdirpath = "");
if ( ! newemptyhandle ( &subdirpath ) )
return ( false );
-
+
// loop { \xC7pop out to the root looking for #directives
while (true) {
-
+
// local (i);
// if nomad == nil or nomad == @root {
// break};
@@ -3559,7 +3600,7 @@
if ((nomadtable == roottable) || !findinparenttable (nomadtable, &nomad.ht, &nomad.h))
break;
-
+
// for i = 1 to sizeOf (nomad^) {
for (hn = (**nomadtable).hfirstsort; hn != nil; hn = (**hn).sortedlink) {
@@ -3574,39 +3615,51 @@
// if lowername == "ftpsite" { // dmb: pulled this out of additemtopagetable
// adrpagetable^.subdirectoryPath = subdirpath;
// adrpagetable^.adrSiteRootTable = nomad}; \xC74.2
-
- if ( textHandleEqualsBigstring (name, BIGSTRING ("\x08" "#ftpsite"), true ) && !hashTableSymbolExistsBigstring (hpagetable, str_ftpsite)) {
+
+ if ( textHandleEqualsBigstring ( name, BIGSTRING ( "\x08" "#ftpsite" ), true ) && !hashTableSymbolExistsBigstring ( hpagetable, str_ftpsite ) ) {
- if ( ! langassignstringvalue ( hpagetable, NULL, BIGSTRING ( "\x10" "subdirectoryPath" ), subdirpath, NULL ) )
- goto exit;
+ if ( ! langassignstringvalue ( hpagetable, NULL, BIGSTRING ( "\x10" "subdirectoryPath" ), subdirpath, NULL ) ) {
+ disposehandle ( name );
+ disposehandle ( subdirpath );
+
+ return ( false );
+
+ }
+
if ( ! langAssignAddressValueBigstring ( hpagetable, BIGSTRING ( "\x10" "adrSiteRootTable" ), &nomad ) )
goto exit;
- }
+
+ } // if
if (!additemtopagetable (nomadtable, hn, hpagetable))
goto exit;
- }
+
+ } // if
// else {
// break}};
//else
// break;
- }
+ disposehandle ( name );
+ name = NULL;
+
+ } // for
+
// if defined (nomad^.tools) {
// addItemToPageTable (@nomad^.tools)};
if (hashTableLookupNodeBigstring (nomadtable, BIGSTRING ("\x05" "tools"), &hn))
additemtopagetable (nomadtable, hn, hpagetable);
-
+
// if defined (nomad^.glossary) {
// addItemToPageTable (@nomad^.glossary)};
if (hashTableLookupNodeBigstring (nomadtable, BIGSTRING ("\x08" "glossary"), &hn))
additemtopagetable (nomadtable, hn, hpagetable);
-
+
// subdirpath = nameOf (nomad^) + pc + subdirpath;
// nomad = parentOf (nomad^)}
@@ -3621,11 +3674,10 @@
exit:
disposehandle ( name );
- // disposehandle ( subdirpath );
- return ( fl );
-
- } /*buildpagetableverb*/
+ return ( fl );
+
+ } // buildpagetableverb
#ifdef MACVERSION
@@ -3698,8 +3750,9 @@
static boolean rundirectiveverb (hdltreenode hp1, tyvaluerecord *v) {
+
+ /*
- /*
on runDirective (linetext, adrpagetable=@websites.["#data"]) { \xC74.2 -- extracted from renderObject macro
\xC7linetext contains a #directive line
\xC7process the directive and return the name of the directive
@@ -3724,6 +3777,7 @@
if lastdirective == "template" { \xC74.0.2
adrpagetable^.indirectTemplate = true};
return (lastdirective)}
+
*/
Handle s;
@@ -3732,23 +3786,25 @@
if (!getexempttextvalue (hp1, 1, &s))
return (false);
-
+
if (!textcommentdelete (s))
goto error;
-
+
if (!getoptionalpagetablevalue (hp1, 2, &pageinfo.hpagetable))
goto error;
-
+
if (!htmlrundirective (&pageinfo, s, fieldname))
goto error;
-
+
return (setstringvalue (fieldname, v));
error:
+
disposehandle (s);
return (false);
- } /*rundirectiveverb*/
+
+ } // rundirectiveverb
static boolean rundirectivesverb (hdltreenode hp1, tyvaluerecord *v) {
@@ -4399,7 +4455,7 @@
//
// 2007-02-23 creedon: support for long odb item names and file paths
//
-
+
Handle handleName;
hdlhashtable ht;
tyvaluerecord val;
@@ -4408,23 +4464,23 @@
if (!getaddressparam (hp1, 1, &val))
return (false);
-
+
if (!getaddressvalue (val, &ht, &handleName))
return (false);
-
+
if ( *handleName [ 0 ] == '#' ) {
setbooleanvalue (true, v);
-
+
return (true);
}
-
+
lowertext ( *handleName, gethandlesize ( handleName ) );
- if ( textHandleEqualsBigstring (handleName, str_glossary, false )
- || textHandleEqualsBigstring (handleName, str_images, false )
- || textHandleEqualsBigstring (handleName, str_tools, false )) {
+ if ( textHandleEqualsBigstring ( handleName, str_glossary, false )
+ || textHandleEqualsBigstring ( handleName, str_images, false )
+ || textHandleEqualsBigstring ( handleName, str_tools, false ) ) {
setbooleanvalue (true, v);
@@ -4433,14 +4489,14 @@
return (true);
}
-
+
disposehandle ( handleName );
setbooleanvalue (false, v);
-
+
return (true);
-
- } /*traversalskipverb*/
+
+ } // traversalskipverb
static boolean getpagetableaddressverb (hdltreenode hp1, tyvaluerecord *v) {
@@ -4479,11 +4535,13 @@
return (true);
- } /*getpagetableaddressverb*/
+ } // getpagetableaddressverb
#ifdef MACVERSION
-#pragma mark === search indexing ===
+
+ #pragma mark === search indexing ===
+
#endif
static boolean stripmarkup (handlestream *s) {
@@ -4577,21 +4635,21 @@
copyhandle ( handleAddress, &h );
- disablelangerror ();
+ disablelangerror ( );
fl = langexpandtodotparams ( h, &hparent, handlePage ); // h is consumed
- enablelangerror ();
+ enablelangerror ( );
- if (fl) { // an odb address
+ if ( fl ) { // an odb address
+
+ if ( ! findinparenttable ( hparent, &hparent, handleParent ) ) {
- if (!findinparenttable (hparent, &hparent, handleParent)) {
-
if ( ! newemptyhandle ( handleParent ) )
return ( false );
}
- return (true);
+ return ( true );
}
@@ -4602,7 +4660,7 @@
if ( ctwords >= 4 ) {
nthfieldhandle ( handleAddress, '/', ctwords, handlePage );
-
+
nthfieldhandle ( handleAddress, '/', --ctwords, handleParent );
}
@@ -4623,7 +4681,7 @@
fl = pathtofilespec ( handleAddress, &fs );
- if (fl) { // maybe a valid file
+ if ( fl ) { // maybe a valid file
Handle h;
@@ -4639,6 +4697,8 @@
fileFromPathTextHandle ( h, *handleParent );
+ disposehandle ( h );
+
}
enablelangerror ( );
@@ -4701,7 +4761,7 @@
} // isstalepageaddress
-static boolean cleanindextable (hdlhashtable hpages) {
+static boolean cleanindextable ( hdlhashtable hpages ) {
//
// 2007-02-24 creedon: support for long odb item names and file paths
@@ -4716,10 +4776,10 @@
Handle handleAddress;
hdlhashnode hkey, hnext;
- for (hkey = (**hpages).hfirstsort; hkey != nil; hkey = hnext) {
+ for ( hkey = ( **hpages ).hfirstsort; hkey != nil; hkey = hnext ) {
+
+ hnext = ( **hkey ).sortedlink;
- hnext = (**hkey).sortedlink;
-
gethashkey ( hkey, &handleAddress );
if ( isstalepageaddress ( handleAddress ) )
@@ -4736,9 +4796,9 @@
}
- return (true);
+ return ( true );
- } /*cleanindextable*/
+ } // cleanindextable
static boolean deindexpage ( hdlhashtable hindex, Handle handlePageKey ) {
@@ -4817,7 +4877,7 @@
return (true);
- } /*deindexpage*/
+ } // deindexpage
static boolean indexpage ( const Handle handleAddress, bigstring bsurl,
@@ -4825,7 +4885,7 @@
hdlhashtable hstopwords, Handle const handleParent, Handle *handlePage ) {
#pragma unused (bsurl)
-
+
/*
Prepare text to be indexed.
Replace whitespace characters and punctuation with spaces.
@@ -4847,9 +4907,9 @@
if (!deindexpage (hindex, handleAddress))
return (false);
+
+ for ((*s).pos = 0; (*s).pos < (*s).eof; ++(*s).pos) {
- for ((*s).pos = 0; (*s).pos < (*s).eof; ++(*s).pos) {
-
p = (byte *)(*(*s).data + (*s).pos);
switch (*p) { // set chreplace or bsreplace
@@ -4876,28 +4936,28 @@
case '[':
case ']':
*p = chspace;
-
+
default:
break;
}
}
-
+
if (!stripmarkup (s))
return (false);
-
+
p = (unsigned char *)(*(*s).data);
ctwords = textcountwords (p, (*s).eof, chspace, true);
for (ixword = 1; ixword <= ctwords; ++ixword) {
-
+
textnthword (p, (*s).eof, ixword, chspace, true, &offset, &len);
texttostring (p + offset, len, bsword);
-
+
if (getstringcharacter (bsword, 0) == '#') //it's a directive
continue;
-
+
dropnonalphas (bsword);
alllower (bsword);
@@ -4907,28 +4967,28 @@
if (stringlength (bsword) < 3) //we don't index 1- and 2-letter words, except for "op" and "wp"
if (!equalstrings (bsword, BIGSTRING ("\x02" "op")) && !equalstrings (bsword, BIGSTRING ("\x02" "wp")))
continue;
-
+
if ( hashTableSymbolExistsBigstring ( hstopwords, bsword ) ) //check if this is on the list of words not to index
continue; //don't index
-
+
setstringwithchar (getstringcharacter (bsword, 0), bsletter);
if (!isalpha (getstringcharacter (bsletter, 0)))
continue;
-
+
// find the count for this page
if ( ! langSureTableValueBigstring (hindex, bsletter, &hwords)) // each letter table contains word tables
return (false);
-
+
if ( ! langSureTableValueBigstring (hwords, bsword, &hpages)) // each word table contains addresses
return (false);
-
+
if (!hashtablelookup (hpages, handleAddress, &vcount, &hnode)) // this objects count for this word
initvalue (&vcount, longvaluetype); //first occurence of this word in the page
-
+
if (!coercetolong (&vcount)) //make sure it's a number
return (false);
-
+
++vcount.data.longvalue; //one more occurrance
bundle { //do relevancy ranking
@@ -4938,13 +4998,13 @@
if ( textpatternmatch ( *handleAddress, gethandlesize ( handleAddress ), bsword, true ) > 0 )
if (vcount.data.longvalue < 100)
vcount.data.longvalue += 100;
-
+
if ( textpatternmatch ( **handlePage, gethandlesize ( *handlePage ), bsword, true ) > 0)
if (vcount.data.longvalue < 500)
vcount.data.longvalue += 500;
+
+ if ( textHandleEqualsBigstring ( handleParent, bsword, true )) {
- if ( textHandleEqualsBigstring ( handleParent, bsword, true )) {
-
Handle h;
getNthFieldTextHandle ( *handlePage, 1, '.', false, &h );
@@ -4964,14 +5024,14 @@
if (vcount.data.longvalue < 2000)
vcount.data.longvalue += 2000;
}
-
+
if ( ! hashtab...
[truncated message content] |
|
From: <cre...@us...> - 2007-06-18 18:00:08
|
Revision: 1698
http://svn.sourceforge.net/frontierkernel/?rev=1698&view=rev
Author: creecode
Date: 2007-06-18 11:00:08 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
rollback to v5.0.37
Added Paths:
-----------
Frontier/vendor/MySQL/current/
Copied: Frontier/vendor/MySQL/current (from rev 1697, Frontier/vendor/MySQL/5.0.37)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-18 17:58:12
|
Revision: 1697
http://svn.sourceforge.net/frontierkernel/?rev=1697&view=rev
Author: creecode
Date: 2007-06-18 10:58:07 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
delete in prep for rollback to v5.0.37
Removed Paths:
-------------
Frontier/vendor/MySQL/current/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-18 17:49:54
|
Revision: 1696
http://svn.sourceforge.net/frontierkernel/?rev=1696&view=rev
Author: creecode
Date: 2007-06-18 10:49:57 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
has bug so we'll roll back to v5.0.37
Removed Paths:
-------------
Frontier/vendor/MySQL/5.0.41/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-18 17:42:58
|
Revision: 1695
http://svn.sourceforge.net/frontierkernel/?rev=1695&view=rev
Author: creecode
Date: 2007-06-18 10:43:00 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Tagging the v10.1a14 release of the Frontier Kernel.
Added Paths:
-----------
Frontier/tags/release-Frontier_10.1a14/
Copied: Frontier/tags/release-Frontier_10.1a14 (from rev 1694, Frontier/trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cre...@us...> - 2007-06-18 04:09:16
|
Revision: 1694
http://svn.sourceforge.net/frontierkernel/?rev=1694&view=rev
Author: creecode
Date: 2007-06-17 21:09:17 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
ported r1646:1693 from trunk
Modified Paths:
--------------
Frontier/branches/mysql/Common/headers/versions.h
Frontier/branches/mysql/Common/source/about.c
Frontier/branches/mysql/Common/source/fileops.c
Frontier/branches/mysql/Common/source/fileverbs.c
Frontier/branches/mysql/Common/source/langhtml.c
Frontier/branches/mysql/Common/source/langsystypes.c
Frontier/branches/mysql/Common/source/langvalue.c
Frontier/branches/mysql/Common/source/shell.c
Modified: Frontier/branches/mysql/Common/headers/versions.h
===================================================================
--- Frontier/branches/mysql/Common/headers/versions.h 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/headers/versions.h 2007-06-18 04:09:17 UTC (rev 1694)
@@ -69,10 +69,10 @@
#define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 13 /* for non-final releases only */
- #define APP_BUILD_NUMBER 13 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a13"
+ #define APP_VERSION_STRING "10.1a14"
#else
@@ -95,10 +95,10 @@
#define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 13 /* for non-final releases only */
- #define APP_BUILD_NUMBER 13 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a13"
+ #define APP_VERSION_STRING "10.1a14"
#endif
#else
@@ -121,10 +121,10 @@
#define APP_SUBMINOR_VERSION_BCD 0x10 /* sub and minor version in BCD notation */
#define APP_STAGE_CODE 0x40 /* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
- #define APP_REVISION_LEVEL 13 /* for non-final releases only */
- #define APP_BUILD_NUMBER 13 /* increment by one for every release, final or not */
+ #define APP_REVISION_LEVEL 14 /* for non-final releases only */
+ #define APP_BUILD_NUMBER 14 /* increment by one for every release, final or not */
- #define APP_VERSION_STRING "10.1a13"
+ #define APP_VERSION_STRING "10.1a14"
#endif
Modified: Frontier/branches/mysql/Common/source/about.c
===================================================================
--- Frontier/branches/mysql/Common/source/about.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/about.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -85,7 +85,7 @@
typedef struct tyaboutrecord {
-
+
Rect messagearea;
Rect aboutarea;
@@ -95,8 +95,9 @@
boolean flbigwindow;
boolean flextrastats;
-
+
long refcon;
+
} tyaboutrecord, *ptraboutrecord, **hdlaboutrecord;
@@ -187,16 +188,17 @@
#ifdef WIN95VERSION
BIGSTRING ("\x14" "Handles Allocated: "),
#endif
-
+
BIGSTRING (""),
-
+
BIGSTRING ("\x10" "Visible Agent: "),
BIGSTRING ("\x0f" "Current Time: "),
bs_APP_NAME, /* 2006-02-06 aradke: see versions.h */
- BIGSTRING ("\x02" "^0"),
+ BIGSTRING ("\x02" "^0")
+
};
Modified: Frontier/branches/mysql/Common/source/fileops.c
===================================================================
--- Frontier/branches/mysql/Common/source/fileops.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/fileops.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -438,7 +438,7 @@
//
// 1993-09-21 dmb: take vnum as parameter, not volname. otherwise, we can't distinguish between two vols w/the
- // same name.
+ // same name.
//
// 1993-09-07 DW: determine if it's a network volume
//
@@ -488,13 +488,23 @@
void filegetinfofrompb ( FSRefParam *pb, tyfileinfo *info ) {
//
+ // 2007-06-11 creedon: fix for Mac OS X bundles/packages that are
+ // applications not setting creator/type
+ //
+ // fix for flbundle not being set to true for Mac
+ // OS X bundles/packages
+ //
+ // fix for file names that don't have extensions
+ //
// 2006-06-24 creedon: FSRef-ized
//
// 5.1.4 dmb: set finderbits for folders too.
//
- // 1993-09-24 dmb: handle volumes here, combining vol info with root directory folder info. I'm not sure if a
- // volume lock is always reflected in the root directory, so don't set fllocked false if the
- // attribute isn't set in the pb. (it starts out cleared anyway.)
+ // 1993-09-24 dmb: handle volumes here, combining vol info with root
+ // directory folder info. I'm not sure if a volume
+ // lock is always reflected in the root directory, so
+ // don't set fllocked false if the attribute isn't set
+ // in the pb. (it starts out cleared anyway.)
//
unsigned short finderbits;
@@ -534,56 +544,32 @@
if ( ( *info ).flfolder ) {
- boolean flisapplication, flisbundle;
+ ( *info ).flbusy = pb -> catInfo -> valence > 0; // folders are considered "busy" if there are any files within
+ // the folder
- LSIsApplication ( ( *pb ).ref, &flisapplication, &flisbundle );
-
- if ( flisapplication || flisbundle ) { // Mac OS X bundles/packages are not considered folders
-
- ( *info ).flfolder = false;
-
- ( *info ).flbundle = true;
-
- } // if
-
- ( *info ).flbusy = pb -> catInfo -> valence > 0; // Folders are considered "busy" if there are any files
- // within the folder
- if ( ( *info ).flfolder )
-
- ( *info ).filecreator = ( *info ).filetype = ' ';
-
- else {
-
- LSItemInfoRecord iteminfo;
- OSStatus status;
-
- status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestTypeCreator, &iteminfo );
-
- ( *info ).filecreator = iteminfo.creator;
-
- ( *info ).filetype = iteminfo.filetype;
-
- } // if
-
( *info ).iconposition = ( ( FolderInfo * ) pb -> catInfo -> finderInfo ) -> location;
if ( ! ( *info ).flvolume ) { // these aren't the same for a volume & its root dir
-
+
( *info ).ctfiles = pb -> catInfo -> valence;
} // if
- ( *info ).folderview = ( tyfolderview ) 0; // I can't find a way to get this info from FSRefParamPtr, I thought about trying to fake a DInfo structure and getting it from there but it may not even have the right value, I did find a reference to DRMacWindowView // dinfo.frView >> 8;
+ ( *info ).folderview = ( tyfolderview ) 0; // I can't find a way to get this info from FSRefParamPtr, I thought
+ // about trying to fake a DInfo structure and getting it from there
+ // but it may not even have the right value, I did find a reference
+ // to DRMacWindowView // dinfo.frView >> 8;
finderbits = ( ( FolderInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags;
}
+
else { // fill in fields for a file, somewhat different format than a folder
( *info ).ixlabel = ( ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags & kColor ) >> 1;
-
+
( *info ).flbusy = ( pb -> catInfo -> nodeFlags & kFSNodeForkOpenMask ) != 0;
-
+
( *info ).filecreator = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> fileCreator;
( *info ).filetype = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> fileType;
@@ -597,25 +583,79 @@
finderbits = ( ( FileInfo * ) pb -> catInfo -> finderInfo ) -> finderFlags;
} // if
-
- /* copy from the finder bits into the record */ {
+
+ /* copy many of the finder bits into the record */ {
+
+ ( *info ).flalias = ( finderbits & kIsAlias ) != 0;
+
+ ( *info ).flbundle = ( finderbits & kHasBundle ) != 0;
+
+ ( *info ).flinvisible = ( finderbits & kIsInvisible ) != 0;
+
+ ( *info ).flstationery = ( finderbits & kIsStationery ) != 0;
+
+ ( *info ).flshared = ( finderbits & kIsShared ) != 0;
+
+ ( *info ).flnamelocked = ( finderbits & kNameLocked ) != 0;
+
+ ( *info ).flcustomicon = ( finderbits & kHasCustomIcon ) != 0;
+
+ } // finder bits
+
+ if ( ( *info ).flfolder ) {
- ( *info ).flalias = (finderbits & kIsAlias) != 0;
+ boolean flIsApplication, flIsBundle;
+
+ LSIsApplication ( ( *pb ).ref, &flIsApplication, &flIsBundle );
+
+ if ( flIsApplication || flIsBundle ) { // Mac OS X bundles/packages are not considered folders
+
+ ( *info ).flfolder = false;
- ( *info ).flbundle = (finderbits & kHasBundle) != 0;
+ ( *info ).flbundle = true;
- ( *info ).flinvisible = (finderbits & kIsInvisible) != 0;
+ } // if
- ( *info ).flstationery = (finderbits & kIsStationery) != 0;
+ if ( flIsApplication ) { // for Mac OS X bundles/packages that are applications we need to grab creator/type
+
+ OSStatus status;
+ LSItemInfoRecord itemInfo;
- ( *info ).flshared = (finderbits & kIsShared) != 0;
+ status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestTypeCreator, &itemInfo );
- ( *info ).flnamelocked = (finderbits & kNameLocked) != 0;
+ ( *info ).filecreator = itemInfo.creator;
- ( *info ).flcustomicon = (finderbits & kHasCustomIcon) != 0;
+ ( *info ).filetype = itemInfo.filetype;
+
+ } // if
- } // finder bits
+ }
+
+ else {
+
+ if ( ! ( *info ).filetype ) { // try to get from file extension
+
+ bigstring bsext;
+ LSItemInfoRecord iteminfo;
+ OSStatus status;
+ clearbytes ( &iteminfo, sizeof ( iteminfo ) );
+
+ status = LSCopyItemInfoForRef ( ( *pb ).ref, kLSRequestExtension, &iteminfo );
+
+ if ( iteminfo.extension != NULL )
+ CFStringRefToStr255 ( iteminfo.extension, bsext );
+
+ if ( isemptystring ( bsext ) || ( stringlength ( bsext ) > 4 ) ) // no extension
+
+ stringtoostype ( "\x04" "????", &( *info ).filetype );
+ else
+ stringtoostype ( bsext, &( *info ).filetype );
+
+ } // if
+
+ } // if
+
} // filegetinfofrompb
@@ -3546,87 +3586,100 @@
} /*initfile*/
-boolean findapplication (OSType creator, ptrfilespec fsapp) {
-
- /*
- 2006-06-25 creedon: for Mac, FSRef-ized
-
- 2006-04-10 creedon: deleted old code, see revision 1246 for old code
-
- 2006-04-09 creedon: use LSFindApplicationForInfo if available
-
- 5.0.1 dmb: implemented for Win using the registry
+boolean findapplication ( OSType creator, ptrfilespec fsapp ) {
- 2.1b11 dmb: loop through all files in each db if necessary to find one that's actually an application
-
- 9/7/92 dmb: make two passes, skipping volumes mounted with a foreign
- file system the first time through. note: if this turns out not to be
- the best criteria, we could check for shared volumes instead by testing
- vMLocalHand in hasdesktopmanager.
+ //
+ // 2007-06-12 creedon: for Mac, use getfilespecparent
+ //
+ // 2006-06-25 creedon: for Mac, FSRef-ized
+ //
+ // 2006-04-10 creedon: deleted old code, see revision 1246 for old code
+ //
+ // 2006-04-09 creedon: use LSFindApplicationForInfo if available
+ //
+ // 5.0.1 dmb: implemented for Win using the registry
+ //
+ // 2.1b11 dmb: loop through all files in each db if necessary to find one
+ // that's actually an application
+ //
+ // 1992-09-07 dmb: make two passes, skipping volumes mounted with a foreign
+ // file system the first time through. note: if this turns
+ // out not to be the best criteria, we could check for
+ // shared volumes instead by testing vMLocalHand in
+ // hasdesktopmanager.
+ //
+ // also: since we don't maintain the desktop DB when we
+ // delete files, we need to verify that the file we locate
+ // still exists. added fileexists call before returning
+ // true.
+ //
+ // 1991-12-05 dmb: created
+ //
- also: since we don't maintain the desktop DB when we delete files, we
- need to verify that the file we locate still exists. added fileexists
- call before returning true.
+ #ifdef MACVERSION
- 12/5/91 dmb
- */
-
- #ifdef MACVERSION
-
- if ((UInt32) LSFindApplicationForInfo == (UInt32) kUnresolvedCFragSymbolAddress)
- return (false);
+ OSStatus status;
- if (LSFindApplicationForInfo (creator, NULL, NULL, &( *fsapp ).fsref, NULL) != noErr)
- return (false);
-
- return (true);
+ if ( ( UInt32 ) LSFindApplicationForInfo == ( UInt32 ) kUnresolvedCFragSymbolAddress )
+ return ( false );
+
+ status = LSFindApplicationForInfo ( creator, NULL, NULL, &( *fsapp ).fsref, NULL);
+
+ if ( status != noErr )
+ return ( false );
+
+ getfilespecparent ( fsapp );
+
+ return ( true );
+
+ #endif // MACVERSION
- #endif /* MACVERSION */
-
#ifdef WIN95VERSION
-
+
byte bsextension [8];
bigstring bsregpath, bsoptions;
-
+
ostypetostring (creator, bsextension);
-
+
poptrailingwhitespace (bsextension);
-
+
insertchar ('.', bsextension);
pushchar (chnul, bsextension);
// copyctopstring ("software\\Microsoft\\Windows\\CurrentVersion", bsregpath);
-
+
if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsextension, NULL, bsregpath))
return (false);
+
+ pushstring ("\x13\\shell\\open\\command", bsregpath);
- pushstring ("\x13\\shell\\open\\command", bsregpath);
-
if (!getRegKeyString ((Handle) HKEY_CLASSES_ROOT, bsregpath, NULL, bsregpath))
return (false);
+
+ if (getstringcharacter (bsregpath, 0) == '"') {
- if (getstringcharacter (bsregpath, 0) == '"') {
+ popleadingchars (bsregpath, '"');
- popleadingchars (bsregpath, '"');
-
firstword (bsregpath, '"', bsregpath);
+
}
+
else {
+
+ lastword (bsregpath, ' ', bsoptions);
- lastword (bsregpath, ' ', bsoptions);
-
if (stringlength (bsoptions) < stringlength (bsregpath))
deletestring (bsregpath, stringlength (bsregpath) - stringlength (bsoptions) + 1, stringlength (bsoptions));
}
+
+ return (pathtofilespec (bsregpath, fsapp));
- return (pathtofilespec (bsregpath, fsapp));
+ #endif // WIN95VERSION
+
+ } // findapplication
- #endif /* WIN95VERSION */
- } /* findapplication */
-
-
boolean extendfilespec ( const ptrfilespec fsin, ptrfilespec fsout ) {
//
Modified: Frontier/branches/mysql/Common/source/fileverbs.c
===================================================================
--- Frontier/branches/mysql/Common/source/fileverbs.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/fileverbs.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -2035,21 +2035,22 @@
#endif
-static boolean findapplicationverb (hdltreenode hparam1, tyvaluerecord *v) {
-
+static boolean findapplicationverb ( hdltreenode hparam1, tyvaluerecord *v ) {
+
OSType creator;
tyfilespec fsapp;
flnextparamislast = true;
- if (!getostypevalue (hparam1, 1, &creator))
- return (false);
+ if ( ! getostypevalue ( hparam1, 1, &creator ) )
+ return ( false );
+
+ if ( ! findapplication ( creator, &fsapp ) )
+ clearbytes ( &fsapp, sizeof ( fsapp ) );
+
+ return ( setfilespecvalue ( &fsapp, v ) );
- if (!findapplication (creator, &fsapp))
- clearbytes (&fsapp, sizeof (fsapp));
-
- return (setfilespecvalue (&fsapp, v));
- } /*findapplicationverb*/
+ } // findapplicationverb
#ifdef WIN95VERSION
Modified: Frontier/branches/mysql/Common/source/langhtml.c
===================================================================
--- Frontier/branches/mysql/Common/source/langhtml.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/langhtml.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -74,7 +74,7 @@
#define fldebugwebsite false
-#define str_separatorline BIGSTRING ("\x17<hr size=2 width=100% />\r")/* 2005-12-18 creedon - end tag with space slash for compatibility with post HTML 4.01 standards */
+#define str_separatorline BIGSTRING ("\x17<hr size=\"2\" width=\"100%\" />\r")/* 2005-12-18 creedon - end tag with space slash for compatibility with post HTML 4.01 standards */
#define str_macroerror BIGSTRING ("\x20<b>[</b>Macro error: ^0<b>]</b>\r")
#define str_mailto BIGSTRING ("\x1A<a href=\"mailto:^0\">^0</a>")
#define str_hotlink BIGSTRING ("\x13<a href=\"^0\">^1</a>")
@@ -205,7 +205,7 @@
#define STR_P_CONDITION BIGSTRING ("\x09" "condition")
#define STR_P_RESPONDER BIGSTRING ("\x09" "responder")
#define STR_P_PATHARGS BIGSTRING ("\x08" "pathArgs")
-#define STR_P_ADRTABLE BIGSTRING ("\x08" "adrTable")
+#define STR_P_ADRTABLE BIGSTRING ("\x08" "adrTable")
#define STR_P_FLPARAMS BIGSTRING ("\x08" "flParams")
#define STR_P_ENABLED BIGSTRING ("\x07" "enabled")
#define STR_P_REQUEST BIGSTRING ("\x07" "request")
@@ -245,6 +245,7 @@
#define STR_P_DOLLAR BIGSTRING ("\x01" "$")
#define STR_P_SPACE BIGSTRING ("\x01" " ")
#define STR_P_EMPTY BIGSTRING ("\x00")
+#define STR_P_USERWEBSERVERSTRING BIGSTRING ( "\x11" "headerFieldServer" )
#define STR_STATUSCONTINUE "HTTP/1.1 100 CONTINUE\r\n\r\n"
#define sizestatuscontinue 25
@@ -5507,38 +5508,82 @@
}/*webserverparsecookies*/
-
-static boolean webservergetserverstring (tyvaluerecord *vreturn) {
-
+static boolean webservergetpref (bigstring bsprefname, tyvaluerecord *vreturn) {
+
/*
- 6.1d2 AR: Return a string identifying the server software, i.e. UserLand Frontier/6.1d2-WinNT
+ 6.1d2 AR: A utility function for getting a pref from user.webserver.prefs.
+ If no value is found in that table, we return false in vreturn.
6.1d4 AR: Reviewed for proper error handling and reporting.
+
+ 2007-06-02 aradke: Don't set *vreturn to false if the requested pref doesn't exist.
+ return false instead. This makes it possible for the caller to differentiate
+ between a non-existant pref and one that is actually set to false.
*/
+
+ hdlhashtable hprefstable;
+ tyvaluerecord val;
+ boolean fl;
+ hdlhashnode hnode;
+
+ disablelangerror ();
+
+ fl = langfastaddresstotable (roottable, STR_P_USERWEBSERVERPREFS, &hprefstable)
+ && langhashtablelookup (hprefstable, bsprefname, &val, &hnode);
+
+ if (fl)
+ fl = copyvaluerecord (val, vreturn);
+
+ if (fl)
+ if ((*vreturn).valuetype == externalvaluetype)
+ if (langexternalgettype (*vreturn) == idwordprocessor)
+ fl = coercetostring (vreturn);
+
+ enablelangerror ();
+
+ return (fl);
+ } /*webservergetpref*/
+
+static boolean webservergetserverstring ( tyvaluerecord *vreturn ) {
+
+ //
+ // 2007-06-02 creedon: call webservergetpref to grab value at
+ // user.webserver.prefs.headerFieldServer if defined
+ //
+ // 6.1d2 AR: Return a string identifying the server software, i.e.
+ // Frontier/6.1d2-WinNT
+ //
+ // 6.1d4 AR: Reviewed for proper error handling and reporting.
+ //
+
Handle h = nil;
tyvaluerecord vversion, vos;
- if (!newtexthandle (STR_P_SERVERSTRING, &h))
- return (false);
+ if ( webservergetpref ( STR_P_USERWEBSERVERSTRING, vreturn ) )
+ return ( true );
+
+ if ( ! newtexthandle ( STR_P_SERVERSTRING, &h ) )
+ return ( false );
- if (!frontierversion (&vversion))
+ if ( ! frontierversion ( &vversion ) )
goto exit;
- if (!sysos (&vos))
+ if ( ! sysos ( &vos ) )
goto exit;
- if (!parsedialoghandle (h, vversion.data.stringvalue, vos.data.stringvalue, nil, nil))
+ if ( ! parsedialoghandle ( h, vversion.data.stringvalue, vos.data.stringvalue, nil, nil ) )
goto exit;
- return (setheapvalue (h, stringvaluetype, vreturn));
+ return ( setheapvalue ( h, stringvaluetype, vreturn ) );
-exit:
+ exit:
- disposehandle (h);
+ disposehandle ( h );
- return (false);
- }/*webservergetserverstring*/
+ return ( false );
+
+ } // webservergetserverstring
static boolean webserverbuilderrorpage (Handle hshort, Handle hlong, Handle *hpage) {
@@ -5749,7 +5794,7 @@
exemptfromtmpstack (&val);
- /* add Server: UserLand Frontier/6.1d1-NT to header table */
+ /* add Server: Frontier/6.1d1-NT to header table */
if (!webservergetserverstring (&val))
goto exit;
@@ -5920,45 +5965,7 @@
505 HTTP Version Not Supported
*/
-#if 0
-static boolean webservergetpref (bigstring bsprefname, tyvaluerecord *vreturn) {
-
- /*
- 6.1d2 AR: A utility function for getting a pref from user.webserver.prefs.
- If no value is found in that table, we return false in vreturn.
-
- 6.1d4 AR: Reviewed for proper error handling and reporting.
- */
-
- hdlhashtable hprefstable;
- tyvaluerecord val;
- boolean fl;
- hdlhashnode hnode;
-
- disablelangerror ();
-
- fl = langfastaddresstotable (roottable, STR_P_USERWEBSERVERPREFS, &hprefstable)
- && langhashtablelookup (hprefstable, bsprefname, &val, &hnode);
-
- enablelangerror ();
-
- if (!fl)
- return (setbooleanvalue (false, vreturn));
-
- if (!copyvaluerecord (val, vreturn))
- return (false);
-
- if ((*vreturn).valuetype == externalvaluetype)
- if (langexternalgettype (*vreturn) == idwordprocessor)
- coercetostring (vreturn);
-
- return (true);
- } /*webservergetpref*/
-
-#endif
-
-
static boolean webservergetrespondertableaddress (bigstring bsname, tyaddress *adr) {
/*
@@ -6429,38 +6436,38 @@
tyvaluerecord vserve;
- if (!webservergetpref (BIGSTRING ("\x19" "flEnableDirectFileServing"), &vserve))
- goto internal_error;
+ if (webservergetpref (BIGSTRING ("\x19" "flEnableDirectFileServing"), &vserve)) {
- if (!coercetoboolean (&vserve))
- goto internal_error;
-
- if (vserve.data.flvalue) {
+ if (!coercetoboolean (&vserve))
+ goto internal_error;
- unsigned long stream;
- unsigned long fsize;
- tyvaluerecord vheader;
- tyfilespec fs = **val.data.filespecvalue;
-
- if (!filesize (&fs, &fsize))
- goto internal_error;
+ if (vserve.data.flvalue) {
+
+ unsigned long stream;
+ unsigned long fsize;
+ tyvaluerecord vheader;
+ tyfilespec fs = **val.data.filespecvalue;
+
+ if (!filesize (&fs, &fsize))
+ goto internal_error;
- if (!langassignlongvalue (hresponseheaderstable, STR_P_CONTENT_LENGTH, fsize))
- goto internal_error;
+ if (!langassignlongvalue (hresponseheaderstable, STR_P_CONTENT_LENGTH, fsize))
+ goto internal_error;
- if (!webserverbuildresponse (bscode, hresponseheaderstable, nil, &vheader))
- goto internal_error;
+ if (!webserverbuildresponse (bscode, hresponseheaderstable, nil, &vheader))
+ goto internal_error;
- if (!langlookuplongvalue (hparamtable, STR_P_STREAM, &stream))
- goto internal_error;
-
- if (!fwsNetEventWriteFileToStream (stream, vheader.data.stringvalue, nil, &fs))
- goto internal_error;
-
- if (!setbooleanvalue (true, vreturn))
- goto internal_error;
-
- goto done;
+ if (!langlookuplongvalue (hparamtable, STR_P_STREAM, &stream))
+ goto internal_error;
+
+ if (!fwsNetEventWriteFileToStream (stream, vheader.data.stringvalue, nil, &fs))
+ goto internal_error;
+
+ if (!setbooleanvalue (true, vreturn))
+ goto internal_error;
+
+ goto done;
+ }
}
}
#endif
Modified: Frontier/branches/mysql/Common/source/langsystypes.c
===================================================================
--- Frontier/branches/mysql/Common/source/langsystypes.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/langsystypes.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -512,53 +512,60 @@
#ifdef MACVERSION
-static boolean stringtoalias (tyvaluerecord *val) {
+ static boolean stringtoalias ( tyvaluerecord *val ) {
- //
- // 2006-06-24 creedon: FSRef-ized
- //
- // 2.1b2 dmb: try converting to a filespec first to ensure that partial path or
- // drive number if processed properly. also, in the filespec case, the alias isn't
- // minimal
- //
- // 1992-07-23 dmb: OK, try to getfullfilepath, but with errors disabled
- //
- // 1992-07-02 dmb: don't call getfullfilepath; makes it impossible to create aliases of
- // not-yet-existing files, or offline volumes
- //
- // 1991-10-07 dmb: make sure we're actually passing a full path to the NewAlias routine
- //
-
- register Handle htext;
- bigstring bspath;
- tyfilespec fs;
- AliasHandle halias;
- boolean flfolder;
- OSErr errcode;
-
- if (!langcanusealiases ())
- return (false);
-
- htext = (*val).data.stringvalue;
-
- texthandletostring (htext, bspath);
-
- if (pathtofilespec (bspath, &fs) && fileexists (&fs, &flfolder))
- errcode = FSNewAlias (nil, &fs.fsref, &halias);
- else
- errcode = NewAliasMinimalFromFullPath (stringlength (bspath), bspath + 1, nil, nil, &halias);
-
- if (oserror (errcode))
- return (false);
-
- if (!setheapvalue ((Handle) halias, aliasvaluetype, val))
- return (false);
-
- releaseheaptmp ((Handle) htext);
-
- return (true);
- } /*stringtoalias*/
-
+ //
+ // 2007-06-11 creedon: fileexists wasn't working, need to extend the
+ // filespec, if successful then file exists
+ //
+ // 2006-06-24 creedon: FSRef-ized
+ //
+ // 2.1b2 dmb: try converting to a filespec first to ensure that
+ // partial path or drive number if processed properly.
+ // also, in the filespec case, the alias isn't minimal
+ //
+ // 1992-07-23 dmb: OK, try to getfullfilepath, but with errors
+ // disabled
+ //
+ // 1992-07-02 dmb: don't call getfullfilepath; makes it impossible to
+ // create aliases of not-yet-existing files, or
+ // offline volumes
+ //
+ // 1991-10-07 dmb: make sure we're actually passing a full path to the
+ // NewAlias routine
+ //
+
+ register Handle htext;
+
+ AliasHandle halias;
+ OSErr errcode;
+ bigstring bspath;
+ tyfilespec fs;
+
+ if ( ! langcanusealiases ( ) )
+ return ( false );
+
+ htext = ( *val ).data.stringvalue;
+
+ texthandletostring ( htext, bspath );
+
+ if ( pathtofilespec ( bspath, &fs ) && extendfilespec ( &fs, &fs ) )
+ errcode = FSNewAlias ( NULL, &fs.fsref, &halias );
+ else
+ errcode = NewAliasMinimalFromFullPath ( stringlength ( bspath), bspath + 1, NULL, NULL, &halias );
+
+ if ( oserror ( errcode ) )
+ return ( false );
+
+ if ( ! setheapvalue ( ( Handle ) halias, aliasvaluetype, val ) )
+ return (false);
+
+ releaseheaptmp ( ( Handle ) htext );
+
+ return ( true );
+
+ } // stringtoalias
+
#endif
Modified: Frontier/branches/mysql/Common/source/langvalue.c
===================================================================
--- Frontier/branches/mysql/Common/source/langvalue.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/langvalue.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -3133,37 +3133,48 @@
boolean coercetostring (tyvaluerecord *val) {
-
+
//
+ // 2007-06-12 creedon: empty bs at start of function, fix for problem
+ // w/filespecvaluetype case returning gibberish for
+ // invalid fs
+ //
// 2006-06-24 creedon: for Mac, FSRef-ized
//
- // 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a reasonable display string for externals
+ // 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a
+ // reasonable display string for externals
//
// 2.1b3 dmb: don't ignore return value from objspectostring
//
- // 1992-08-10 dmb: added flcoerceexternaltostring flag to prevent external-to-string coercion except when explicitly requested by stringfunc in langverbs.c
+ // 1992-08-10 dmb: added flcoerceexternaltostring flag to prevent
+ // external-to-string coercion except when explicitly
+ // requested by stringfunc in langverbs.c
//
register tyvaluerecord *v = val;
+
+ Handle h;
bigstring bs;
- Handle h;
+ setemptystring ( bs );
+
if (!langheapallocated (v, &h))
h = nil;
+
+ switch ((*v).valuetype) {
- switch ((*v).valuetype) {
-
case stringvaluetype:
return (true);
+
+ case novaluetype: {
- case novaluetype:
- if (flinhibitnilcoercion)
- return (false);
+ if ( flinhibitnilcoercion )
+ return ( false );
+
+ break;
- setemptystring (bs);
+ }
- break;
-
/*
case passwordvaluetype:
(*v).valuetype = stringvaluetype;
@@ -3173,46 +3184,46 @@
case addressvaluetype:
return (addresstostring (v));
-
+
case booleanvaluetype:
if ((*v).data.flvalue)
copystring (bstrue, bs);
else
copystring (bsfalse, bs);
-
+
break;
case charvaluetype:
setstringwithchar ((*v).data.chvalue, bs);
break;
-
+
case intvaluetype:
shorttostring ((*v).data.intvalue, bs);
break;
-
+
case longvaluetype:
numbertostring ((*v).data.longvalue, bs);
break;
-
+
case ostypevaluetype:
case enumvaluetype:
ostypetostring ((*v).data.ostypevalue, bs);
break;
-
+
case directionvaluetype:
dirtostring ((*v).data.dirvalue, bs);
break;
-
+
case datevaluetype:
timedatestring ((*v).data.datevalue, bs);
break;
-
+
case fixedvaluetype: {
double x = (double) (*v).data.longvalue / 65536;
@@ -3224,72 +3235,72 @@
break;
}
-
+
case singlevaluetype:
floattostring ((*v).data.singlevalue, bs);
break;
-
+
case doublevaluetype:
floattostring (**(*v).data.doublevalue, bs);
break;
-
+
case pointvaluetype:
pointtostring ((*v).data.pointvalue, bs);
break;
-
+
case rectvaluetype:
recttostring (**(*v).data.rectvalue, bs);
break;
-
+
case rgbvaluetype:
rgbtostring (**(*v).data.rgbvalue, bs);
break;
-
+
case patternvaluetype:
patterntostring (**(*v).data.patternvalue, bs);
break;
-
+
case objspecvaluetype:
if (!objspectostring ((*v).data.objspecvalue, bs))
return (false);
+
+ break;
- break;
-
case aliasvaluetype:
aliastostring ((*v).data.aliasvalue, bs);
break;
+
+ case filespecvaluetype: {
- case filespecvaluetype: {
-
- tyfilespec fs = **(*v).data.filespecvalue;
-
+ tyfilespec fs = **( *v ).data.filespecvalue;
+
filespectopath ( &fs, bs );
break;
}
-
+
case binaryvaluetype:
if (!copyvaluedata (v))
return (false);
-
+
stripbinarytypeid ((*v).data.binaryvalue);
(*v).valuetype = stringvaluetype;
return (true);
-
+
case listvaluetype:
case recordvaluetype:
return (coercelistvalue (v, stringvaluetype));
-
+
case codevaluetype:
bigvaltostring (v, bs);
@@ -3297,7 +3308,7 @@
case externalvaluetype:
if (!flcoerceexternaltostring) {
-
+
/* 4.1b4 dmb*/
/*
langbadexternaloperror (badexternaloperationerror, *v);
@@ -3307,27 +3318,27 @@
break;
}
-
+
if (!newemptyhandle (&h))
return (false);
+
+ if (!langexternalpacktotext ((hdlexternalhandle) (*v).data.externalvalue, h)) {
- if (!langexternalpacktotext ((hdlexternalhandle) (*v).data.externalvalue, h)) {
-
disposehandle (h);
return (false);
}
-
+
disposevaluerecord (*v, true);
return (setheapvalue (h, stringvaluetype, v));
-
+
default:
langerror (stringcoerceerror);
return (false);
} /*switch*/
-
+
disposevaluerecord (*v, true);
return (setstringvalue (bs, v));
Modified: Frontier/branches/mysql/Common/source/shell.c
===================================================================
--- Frontier/branches/mysql/Common/source/shell.c 2007-06-17 21:28:42 UTC (rev 1693)
+++ Frontier/branches/mysql/Common/source/shell.c 2007-06-18 04:09:17 UTC (rev 1694)
@@ -1314,7 +1314,7 @@
htmlinitverbs ();
- sqliteinitverbs (); /* 2006-03-15 gewirtz: langsqlite.c */
+ sqliteinitverbs (); /* 2006-03-15 gewirtz: langsqlite.c */
mysqlinitverbs (); /* 2007-04-08 gewirtz: langmysql.c */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
