Download as
Browse Code »

Commit 98f1402bc58d77a6a643b70ea6d57be2e814c769

Authored by Eduardo Heinske
1 parent 9ee59864
Exists in master and in 19 other branches Marcelotmpdesenv, Marctmp, desenv, feature-050, feature-50, feature-76, fix-101, fix-24, fix-43, fix-58, fix-86, fix-89, fix-92, fix-93, fix-95, fix-96, fix-97, fix-99, fix-gearman

Correção final nos scripts

Showing 4 changed files with 33 additions and 22 deletions   Show diff stats
rn/PenAtualizadorRN.php
  Diff comments   View file @98f1402
... ... @@ -7,14 +7,14 @@
7 7 abstract class PenAtualizadorRN extends InfraRN {
8 8  
9 9 const VER_NONE = '0.0.0';// Modulo não instalado
10   - const VER_001 = '0.0.1';
  10 + /* const VER_001 = '0.0.1';
11 11 const VER_002 = '0.0.2';
12 12 const VER_003 = '0.0.3';
13 13 const VER_004 = '0.0.4';
14 14 const VER_005 = '0.0.5';
15 15 const VER_006 = '0.0.6';
16 16 const VER_007 = '0.0.7';
17   - const VER_008 = '0.0.8';
  17 + const VER_008 = '0.0.8';*/
18 18 const VER_100 = '1.0.0';
19 19  
20 20 protected $sei_versao;
... ... @@ -254,7 +254,7 @@ abstract class PenAtualizadorRN extends InfraRN {
254 254 // Instalar todas atualizações
255 255 if($bolAlgumFiltroUsado === false) {
256 256  
257   - $strRegexVersao = sprintf('[%d-%d]', ($numPenVersao + 1), $numVersaoInstalar);
  257 + $strRegexVersao = sprintf('[%d\-%d]', ($numPenVersao + 1), $numVersaoInstalar);
258 258 }
259 259 // Instalar somente a solicitada
260 260 else {
... ... @@ -262,7 +262,7 @@ abstract class PenAtualizadorRN extends InfraRN {
262 262 $strVersaoInstalar = $strPenVersao;
263 263 $strRegexVersao = intval(substr($strPenVersao, -1) + 1);
264 264 }
265   -
  265 +
266 266 // instalarV[0-9]{1,2}[0-9](R[0-9]{1,3})?(S[0-9]{1,3})?(US|IW[0-9]{1,4})?
267 267 $strRegex = sprintf('/^instalarV[0-9][0-9]%s%s%s%s/i',
268 268 $strRegexVersao,
... ... @@ -273,7 +273,7 @@ abstract class PenAtualizadorRN extends InfraRN {
273 273  
274 274 // Tenta encontrar métodos que iniciem com instalar
275 275 $arrMetodo = (array)preg_grep ($strRegex, get_class_methods($this));
276   -
  276 +
277 277 if(empty($arrMetodo)) {
278 278  
279 279 throw new InfraException(sprintf('NENHUMA ATUALIZACAO FOI ENCONTRADA SUPERIOR A VERSAO %s DO MODULO PEN', $strPenVersao));
... ...
rn/PenAtualizarSeiRN.php
  Diff comments   View file @98f1402
... ... @@ -5,7 +5,7 @@
5 5 * @author Join Tecnologia
6 6 */
7 7 class PenAtualizarSeiRN extends PenAtualizadorRN {
8   -
  8 +
9 9 protected $versaoMinRequirida = '2.6.0';
10 10 protected $sei_versao = 'PEN_VERSAO_MODULO_SEI';
11 11  
... ... @@ -17,7 +17,7 @@ class PenAtualizarSeiRN extends PenAtualizadorRN {
17 17 return $this->objBanco;
18 18 }
19 19  
20   - protected function instalarV001(){
  20 + protected function instalarV100(){
21 21  
22 22 $objInfraBanco = $this->inicializarObjInfraIBanco();
23 23 $objMetaBD = $this->inicializarObjMetaBanco();
... ... @@ -603,6 +603,18 @@ class PenAtualizarSeiRN extends PenAtualizadorRN {
603 603 }
604 604 }
605 605 //----------------------------------------------------------------------
  606 +
  607 + $this->instalarV002R003S000IW001();
  608 + $this->instalarV002R003S000US024();
  609 + $this->instalarV002R003S001US035();
  610 + $this->instalarV003R003S003IW001();
  611 + $this->instalarV004R003S003IW002();
  612 + $this->instalarV005R003S005IW018();
  613 + $this->instalarV005R003S005IW023();
  614 + $this->instalarV006R004S004WI001();
  615 + $this->instalarV007R004S005WI002();
  616 + $this->instalarV008R004S006IW003();
  617 +
606 618 }
607 619  
608 620 /**
... ... @@ -947,9 +959,6 @@ class PenAtualizarSeiRN extends PenAtualizadorRN {
947 959  
948 960 }
949 961  
950   - public function instalarV100R004S006IW004(){
951   - //Atualiza o parâmetro
952   - }
953 962  
954 963  
955 964 /* protected function instalarV008R004S006WI001(){
... ...
rn/PenAtualizarSipRN.php
  Diff comments   View file @98f1402
... ... @@ -281,6 +281,10 @@ class PenAtualizarSipRN extends PenAtualizadorRN {
281 281 $this->atribuirPerfil($numIdSistema);
282 282 }
283 283  
  284 + protected function instalarV002(){
  285 +
  286 + }
  287 +
284 288 protected function instalarV003R003S003IW001(){
285 289  
286 290  
... ...
sip_atualizar_versao_modulo_pen.php
  Diff comments   View file @98f1402
... ... @@ -425,11 +425,6 @@ class PenMetaBD extends InfraMetaBD {
425 425 abstract class PenAtualizadorRN extends InfraRN {
426 426  
427 427 const VER_NONE = '0.0.0'; // Modulo não instalado
428   - const VER_001 = '0.0.1';
429   - const VER_002 = '0.0.2';
430   - const VER_003 = '0.0.3';
431   - const VER_004 = '0.0.4';
432   - const VER_005 = '0.0.5';
433 428 const VER_100 = '1.0.0';
434 429  
435 430 protected $sei_versao;
... ... @@ -668,7 +663,7 @@ abstract class PenAtualizadorRN extends InfraRN {
668 663 // Instalar todas atualizações
669 664 if ($bolAlgumFiltroUsado === false) {
670 665  
671   - $strRegexVersao = sprintf('[%d-%d]', ($numPenVersao + 1), $numVersaoInstalar);
  666 + $strRegexVersao = sprintf('[%d\-%d]', ($numPenVersao + 1), $numVersaoInstalar);
672 667 }
673 668 // Instalar somente a solicitada
674 669 else {
... ... @@ -955,11 +950,15 @@ class PenAtualizarSipRN extends PenAtualizadorRN {
955 950 $fnCadastrar('BASICO', $numIdSistema);
956 951 }
957 952  
  953 + public function instalarV100(){
  954 + $this->instalarV001R001S001IW001();
  955 + $this->instalarV003R003S003IW001();
  956 + }
  957 +
958 958 /**
959 959 * Instala/Atualiza os módulo PEN para versão 1.0
960 960 */
961   - protected function instalarV001() {
962   -
  961 + protected function instalarV001R001S001IW001() {
963 962 $numIdSistema = $this->getNumIdSistema('SEI');
964 963 $numIdMenu = $this->getNumIdMenu('Principal', $numIdSistema);
965 964  
... ... @@ -1021,13 +1020,12 @@ class PenAtualizarSipRN extends PenAtualizadorRN {
1021 1020 $this->atribuirPerfil($numIdSistema);
1022 1021  
1023 1022 $this->instalarV003R003S003IW001();
1024   -
1025 1023 }
1026   -
1027   - protected function instalarV003R003S003IW001() {
1028 1024  
  1025 +
  1026 + protected function instalarV003R003S003IW001() {
1029 1027  
1030   - $objBD = new ItemMenuBD($this->inicializarObjInfraIBanco());
  1028 + $objBD = new ItemMenuBD($this->inicializarObjInfraIBanco());
1031 1029  
1032 1030 //----------------------------------------------------------------------
1033 1031 // Achar o root
... ...