hholzgra Fri Sep 20 07:55:43 2002 EDT
Added files:
/functable/lib doc_versions.php
Modified files:
/functable dslgen xslgen
Log:
merged common code
Index: functable/dslgen
diff -u functable/dslgen:1.11 functable/dslgen:1.12
--- functable/dslgen:1.11 Fri Sep 20 07:36:20 2002
+++ functable/dslgen Fri Sep 20 07:55:43 2002
@@ -3,41 +3,9 @@
include "config.php";
- $min3 = array();
- $max3 = array();
- $min4 = array();
- $max4 = array();
- $func = array();
- $ver = array();
-
require_once "lib/dbconnect.php";
- $result = mysql_query("select distinct version,versionid from funclist");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
-
$ver[$row["versionid"]]=str_replace("_",".",str_replace("php_","",$row["version"]));
- }
- mysql_free_result($result);
-
-
- $result = mysql_query("select function,min(versionid) as min3,max(versionid)
as max3 from funclist where versionid <400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min3[$row["function"]] = $row["min3"];
- $max3[$row["function"]] = $row["max3"];
- }
- mysql_free_result($result);
-
- $result = mysql_query("select function,min(versionid) as min4,max(versionid)
as max4 from funclist where versionid >=400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min4[$row["function"]] = $row["min4"];
- $max4[$row["function"]] = $row["max4"];
- }
- mysql_free_result($result);
-
+ require_once "lib/doc_versions.php";
echo ";; DO NOT EDIT THIS FILE !!!\n";
echo ";; as it is auto-generated from the same database\n";
@@ -109,64 +77,27 @@
#f)))
";
+
echo "(define (version-info nl)\n";
echo " (cond\n";
- echo ' ((equal-ci? (data nl) "array") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "echo") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "empty") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "eval") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "exit") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "isset") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "list") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "print") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "unset") (literal "PHP 3, PHP 4 "))';
-
- foreach($func as $key => $dummy) {
- if(isset($min3[$key])) {
- $min = $min3[$key]-300;
- $max = $max3[$key]-300;
- $ver3="PHP 3";
- if($min==0) {
- if($max==99) { ; }
- else { $ver3.=" <= ".$ver[$max+300];}
- } else if($min==99){
- $ver3.=" CVS only";
- } else {
- if($max==99) { $ver3.=">= ".$ver[$min+300]; }
- else if ($min==$max) {$ver3.=$ver[$min+300]." only";}
- else { $ver3=$ver[$min+300]." - ".$ver[$max+300]." only";}
- }
- } else {
- $ver3 = "";
- }
- if(isset($min4[$key])) {
- $min = $min4[$key]-400;
- $max = $max4[$key]-400;
- $ver4="PHP 4 ";
- if($min==0) {
- if($max==99) { ; }
- else { $ver4.=" <= ".$ver[$max+400];}
- } else if($min==99){
- $ver4.=" CVS only";
- } else {
- if($max==99) { $ver4.=">= ".$ver[$min+400]; }
- else if ($min==$max) {$ver4.=$ver[$min+400]." only";}
- else { $ver4=$ver[$min+400]." - ".$ver[$max+400]." only";}
- }
- } else {
- $ver4 = "";
- }
-
- if(empty($ver3)||empty($ver4)) {
- $ver34 = "$ver3$ver4";
- } else {
- $ver34 = "$ver3, $ver4";
- }
-
- echo " ((equal-ci? (data nl) \"$key\") (literal \"$ver34\"))\n";
-}
-echo " (else (literal \"no version information, might be only in CVS\"))\n";
-echo " )\n";
-echo " )\n";
+ echo "
+ ((equal-ci? (data nl) 'array') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'echo') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'empty') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'eval') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'exit') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'isset') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'list') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'print') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'unset') (literal 'PHP 3, PHP 4 '))
+ ";
+
+ foreach($doc_version as $key => $version) {
+ echo " ((equal-ci? (data nl) '$key') (literal '$version'))\n";
+ }
+
+ echo " (else (literal 'no version information, might be only in CVS'))\n";
+ echo " )\n";
+ echo " )\n";
?>
Index: functable/xslgen
diff -u functable/xslgen:1.8 functable/xslgen:1.9
--- functable/xslgen:1.8 Fri Sep 20 07:36:20 2002
+++ functable/xslgen Fri Sep 20 07:55:43 2002
@@ -2,42 +2,9 @@
<?
include "config.php";
- $min3 = array();
- $max3 = array();
- $min4 = array();
- $max4 = array();
- $func = array();
- $ver = array();
-
require_once "lib/dbconnect.php";
- $result = mysql_query("select distinct version,versionid from funclist");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
-
$ver[$row["versionid"]]=str_replace("_",".",str_replace("php_","",$row["version"]));
- }
- mysql_free_result($result);
-
-
- $result = mysql_query("select function,min(versionid) as min3,max(versionid)
-as max3 from funclist where versionid <400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min3[$row["function"]] = $row["min3"];
- $max3[$row["function"]] = $row["max3"];
- }
- mysql_free_result($result);
-
- $result = mysql_query("select function,min(versionid) as min4,max(versionid)
-as max4 from funclist where versionid >=400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min4[$row["function"]] = $row["min4"];
- $max4[$row["function"]] = $row["max4"];
- }
- mysql_free_result($result);
+ require_once "lib/doc_versions.php";
echo "<?xml version='1.0' encoding='iso-8859-1'?>";
echo "<!-- DO NOT EDIT THIS FILE !!!\n";
@@ -65,50 +32,8 @@
<function name='unset' from='PHP 3, PHP 4 '/>
";
- foreach($func as $key => $dummy) {
- if(isset($min3[$key])) {
- $min = $min3[$key]-300;
- $max = $max3[$key]-300;
- $ver3="PHP 3";
- if($min==0) {
- if($max==99) { ; }
- else { $ver3.=" <= ".$ver[$max+300];}
- } else if($min==99){
- $ver3.=" CVS only";
- } else {
- if($max==99) { $ver3.=">= ".$ver[$min+300]; }
- else if ($min==$max) {$ver3.=$ver[$min+300]." only";}
- else { $ver3=$ver[$min+300]." - ".$ver[$max+300]."
-only";}
- }
- } else {
- $ver3 = "";
- }
- if(isset($min4[$key])) {
- $min = $min4[$key]-400;
- $max = $max4[$key]-400;
- $ver4="PHP 4 ";
- if($min==0) {
- if($max==99) { ; }
- else { $ver4.=" <= ".$ver[$max+400];}
- } else if($min==99){
- $ver4.=" CVS only";
- } else {
- if($max==99) { $ver4.=">= ".$ver[$min+400]; }
- else if ($min==$max) {$ver4.=$ver[$min+400]." only";}
- else { $ver4=$ver[$min+400]." - ".$ver[$max+400]."
only";}
- }
- } else {
- $ver4 = "";
- }
-
- if(empty($ver3)||empty($ver4)) {
- $ver34 = "$ver3$ver4";
- } else {
- $ver34 = "$ver3, $ver4";
- }
-
- echo " <function name=\"$key\"
from=\"".HTMLSpecialChars($ver34)."\"/>\n";
+ foreach($doc_version as $key => $version) {
+ echo " <function name=\"$key\"
+from=\"".HTMLSpecialChars($version)."\"/>\n";
}
echo "</versions>\n";
?>
Index: functable/lib/doc_versions.php
+++ functable/lib/doc_versions.php
<?php
$min3 = array();
$max3 = array();
$min4 = array();
$max4 = array();
$func = array();
$ver = array();
$doc_version = array();
$result = mysql_query("SELECT DISTINCT version
, versionid
FROM funclist
");
if(!$result) { echo mysql_error(); exit; }
while ($row=mysql_fetch_array($result)) {
$ver[$row["versionid"]]=str_replace("_",".",str_replace("php_","",$row["version"]));
}
mysql_free_result($result);
$result = mysql_query("SELECT function
, MIN(versionid) AS min3
, MAX(versionid) AS max3
FROM funclist
WHERE versionid < 400
GROUP BY function
");
if(!$result) { echo mysql_error(); exit; }
while ($row=mysql_fetch_array($result)) {
$func[$row["function"]] = true;
$min3[$row["function"]] = $row["min3"];
$max3[$row["function"]] = $row["max3"];
}
mysql_free_result($result);
$result = mysql_query("SELECT function
, MIN(versionid) AS min4
, MAX(versionid) AS max4
FROM funclist
WHERE versionid >=400
GROUP BY function
");
if(!$result) { echo mysql_error(); exit; }
while ($row=mysql_fetch_array($result)) {
$func[$row["function"]] = true;
$min4[$row["function"]] = $row["min4"];
$max4[$row["function"]] = $row["max4"];
}
mysql_free_result($result);
foreach($func as $key => $dummy) {
if(isset($min3[$key])) {
$min = $min3[$key]-300;
$max = $max3[$key]-300;
$ver3="PHP 3";
if($min==0) {
if($max==99) { ; }
else { $ver3.=" <= ".$ver[$max+300];}
} else if($min==99){
$ver3.=" CVS only";
} else {
if($max==99) { $ver3.=">= ".$ver[$min+300]; }
else if ($min==$max) {$ver3.=$ver[$min+300]." only";}
else { $ver3=$ver[$min+300]." - ".$ver[$max+300]."
only";}
}
} else {
$ver3 = "";
}
if(isset($min4[$key])) {
$min = $min4[$key]-400;
$max = $max4[$key]-400;
$ver4="PHP 4 ";
if($min==0) {
if($max==99) { ; }
else { $ver4.=" <= ".$ver[$max+400];}
} else if($min==99){
$ver4.=" CVS only";
} else {
if($max==99) { $ver4.=">= ".$ver[$min+400]; }
else if ($min==$max) {$ver4.=$ver[$min+400]." only";}
else { $ver4=$ver[$min+400]." - ".$ver[$max+400]."
only";}
}
} else {
$ver4 = "";
}
if(empty($ver3)||empty($ver4)) {
$doc_version[$key] = "$ver3$ver4";
} else {
$doc_version[$key] = "$ver3, $ver4";
}
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php