diff --git a/html/admin/setup.php b/html/admin/setup.php index bd5144c13..dc5c8ca3c 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -70,33 +70,27 @@ include_once('constant.php'); include_once('postgres.php'); include_once('debug.php'); include_once('ac_common.php'); -/* function GetVersion +/*! ************************************************** - * Purpose : Get version of a database + * \brief Get version of a database, the content of the + * table version * - * parm : - * - $p_cn database connection - * gen : - * - none - * return: - * none + * \param $p_cn database connection + * + * \return version number + * */ function GetVersion($p_cn) { $Res=ExecSql($p_cn,"select val from version"); $a=pg_fetch_array($Res,0); return $a['val']; } -/* function ExecuteScript +/*! ExecuteScript ************************************************** - * Purpose : Execute a sql script + * \brief Execute a sql script * - * parm : - * - $p_cn database connection - * - $script script name - * gen : - * - none - * return: - * none + * \param $p_cn database + * \param $script script name */ function ExecuteScript($p_cn,$script) { $hf=fopen($script,'r'); @@ -160,6 +154,67 @@ function ExecuteScript($p_cn,$script) { } // while (feof) fclose($hf); } +/*! \brief loop to apply all the path to a folder or + * a template + * \param $p_cn database connexion + * \param $p_name database name + * + */ +function apply_patch($p_cn,$p_name) +{ + $MaxVersion=29; + for ( $i = 4;$i <= $MaxVersion;$i++) + { + if ( DEBUG=='false' ) ob_start(); + if ( GetVersion($p_cn) <= $i ) { + echo "Patching ".$p_name. + " from the version $i to the version ".GetVersion($p_cn)."
php.ini est bien configuré
'; + echo 'php.ini est bien configuré
'; } else { - echo 'php mal configuré
'; + echo 'php mal configuré
'; exit -1; } $cn=DbConnect(-2,'template1'); @@ -255,10 +310,9 @@ $sql="select lanname from pg_language where lanname='plpgsql'"; $Res=CountSql($cn,$sql); if ( $Res==0) { ?>Vous devez installer le langage plpgsql pour permettre aux fonctions SQL de fonctionner.
-Pour cela, sur la ligne de commande, faites -createlang plpgsql pour chaque base de données que vous possédez (y compris template0 et template1). +
Pour cela, sur la ligne de commande, faites createlang plpgsql template1
-Pour afficher toutes les bases de données, tapez sur la ligne de commande "psql -l"
+ Attention le paramètre effective_cache_size est de '. + print 'Attention le paramètre effective_cache_size est de '. $a['setting']." au lieu de 1000
"; $flag++; } break; case 'shared_buffers': if ( $a['setting'] < 640 ){ - print 'Attention le paramètre shared_buffer est de '. + print '
Attention le paramètre shared_buffer est de '. $a['setting']."au lieu de 640
"; $flag++; } break; case 'work_mem': if ( $a['setting'] < 8192 ){ - print 'Attention le paramètre work_mem est de '. + print '
Attention le paramètre work_mem est de '. $a['setting']." au lieu de 8192
"; $flag++; } @@ -297,14 +351,14 @@ for ($e=0;$eLa base de données est bien configurée
'; } else { - echo 'Il y a '.$flag.' paramètre qui sont trop bas
'; + echo 'Il y a '.$flag.' paramètre qui sont trop bas
'; } if ( ! isset($_POST['go']) ) { ?> "; -if ( DEBUG=='false' ) ob_start(); - if ( GetVersion($db) <= 4 ) { - ExecuteScript($db,'sql/patch/upgrade4.sql'); - - $sql="select jrn_def_id from jrn_def "; - $Res=ExecSql($db,$sql); - $Max=pg_NumRows($Res); - for ($seq=0;$seq<$Max;$seq++) { - $row=pg_fetch_array($Res,$seq); - $sql=sprintf ("create sequence s_jrn_%d",$row['jrn_def_id']); - ExecSql($db,$sql); - } - } // version == 4 - //-- - // update to the version 5 - //-- - if ( GetVersion($db) == 5 ) { - ExecuteScript($db,'sql/patch/upgrade5.sql'); - } // version == 5 - - - //-- - // update to the version 7 - //-- - if ( GetVersion($db) == 6 ) { - ExecuteScript($db,'sql/patch/upgrade6.sql'); - } // version == 6 - - //-- - // update to the version 8 - //-- - if ( GetVersion($db) == 7 ) { - ExecuteScript($db,'sql/patch/upgrade7.sql'); - // now we use sequence instead of computing a max - // - $Res2=ExecSql($db,'select coalesce(max(jr_grpt_id),1) as l from jrn'); - $Max2= pg_NumRows($Res2) ; - if ( $Max2 == 1) { - $Row=pg_fetch_array($Res2,0); - var_dump($Row); - $M=$Row['l']; - ExecSql($db,"select setval('s_grpt',$M,true)"); - } - } // version == 7 - // version 8 -> 9 - if ( GetVersion($db) == 8 ) { - ExecuteScript($db,'sql/patch/upgrade8.sql'); - } // version == 9->10 - if ( GetVersion($db) == 9 ) { - ExecuteScript($db,'sql/patch/upgrade9.sql'); - } // version == 10->11 - if ( GetVersion($db) == 10 ) { - ExecuteScript($db,'sql/patch/upgrade10.sql'); - } // version - if ( GetVersion($db) == 11 ) { - ExecuteScript($db,'sql/patch/upgrade11.sql'); - } // version - if ( GetVersion($db) == 12 ) { - ExecuteScript($db,'sql/patch/upgrade12.sql'); - } // version - - if ( GetVersion($db) == 13 ) { - ExecuteScript($db,'sql/patch/upgrade13.sql'); - } // version - - if ( GetVersion($db) == 14 ) { - ExecuteScript($db,'sql/patch/upgrade14.sql'); - } // version - if ( GetVersion($db) == 15 ) { - ExecuteScript($db,'sql/patch/upgrade15.sql'); - } // version - - if ( GetVersion($db) == 16 ) { - ExecuteScript($db,'sql/patch/upgrade16.sql'); - } // version - if ( GetVersion($db) == 17 ) { - ExecuteScript($db,'sql/patch/upgrade17.sql'); - $max=getDbValue($db,'select last_value from s_jnt_fic_att_value'); - AlterSequence($db,'s_jnt_fic_att_value',$max+1); - } // version - if ( GetVersion($db) == 18 ) { - ExecuteScript($db,'sql/patch/upgrade18.sql'); - } // version - if ( GetVersion($db) == 19 ) { - ExecuteScript($db,'sql/patch/upgrade19.sql'); - } // version - if ( GetVersion($db) == 20 ) { - ExecuteScript($db,'sql/patch/upgrade20.sql'); - } // version - if ( GetVersion($db) == 21 ) { - ExecuteScript($db,'sql/patch/upgrade21.sql'); - } // version - if ( GetVersion($db) == 22 ) { - ExecuteScript($db,'sql/patch/upgrade22.sql'); - } // version - if ( GetVersion($db) == 23 ) { - ExecuteScript($db,'sql/patch/upgrade23.sql'); - } // version - if ( GetVersion($db) == 24 ) { - ExecuteScript($db,'sql/patch/upgrade24.sql'); - } // version - if ( GetVersion($db) == 25 ) { - ExecuteScript($db,'sql/patch/upgrade25.sql'); - } // version - - if ( GetVersion($db) == 26 ) { - ExecuteScript($db,'sql/patch/upgrade26.sql'); - } // version - if ( GetVersion($db) == 27 ) { - ExecuteScript($db,'sql/patch/upgrade27.sql'); - } // version - if ( GetVersion($db) == 28 ) { - ExecuteScript($db,'sql/patch/upgrade28.sql'); - } // version - if ( GetVersion($db) == 29 ) { - ExecuteScript($db,'sql/patch/upgrade29.sql'); - } // version - -if ( DEBUG == 'false') ob_end_clean(); - }//for + apply_patch($db,$db_row['dos_name']); + } +//---------------------------------------------------------------------- +// Upgrade the template +//---------------------------------------------------------------------- $Resdossier=ExecSql($cn,"select mod_id, mod_name from modeledef"); $MaxDossier=pg_NumRows($Resdossier); -echo "Upgrading Dossier"; +echo "Upgrading template"; for ($e=0;$e < $MaxDossier;$e++) { $db_row=pg_fetch_array($Resdossier,$e); echo "Patching ".$db_row['mod_name']."