Se realizan correcciones varias derivadas del primer testing.

[mecon/intranet.git] / sistema / local_lib / Servicios / Legajos / ExperienciaLaboral.php

diff --git a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php b/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
index eedd9b31b63776781922b710d63a6fe0e609f393..ea1ef93b2c636c84e33efc11b6e39db776c37f68 100644 (file)
--- a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
+++ b/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
@@ -2,16 +2,16 @@
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |
 // vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
 // +--------------------------------------------------------------------+
 // |                      Ministerio de Economía                        |

-// |                             Intranet                              |
+// |                             Intranet                               |

 // +--------------------------------------------------------------------+
 // +--------------------------------------------------------------------+

-// | This file is part of Intranet.                                    |
+// | This file is part of Intranet.                                     |

 // |                                                                    |
 // |                                                                    |

-// | Intranet is free software; you can redistribute it and/or modify  |
+// | Intranet 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; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |
 // | it under the terms of the GNU General Public License as published  |
 // | by the Free Software Foundation; either version 2 of the License,  |
 // | or (at your option) any later version.                             |
 // |                                                                    |

-// | Intranet is distributed in the hope that it will be useful, but   |
+// | Intranet 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.                           |
 // | 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.                           |


@@ -20,18 +20,17 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+

-// | Creado: Mon Jul 7 17:22:10 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Mon Jul 7 17:22:10 2003                                    |
+// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |

 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_ExperienciaLaboral.php 23 2003-07-15 18:56:42Z msklar $
 //
 
 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_ExperienciaLaboral.php 23 2003-07-15 18:56:42Z msklar $
 //
 

-
-

 // +X2C includes
 require_once 'DB.php';
 // ~X2C
 // +X2C includes
 require_once 'DB.php';
 // ~X2C

+require_once 'intranetdb.php';

 
 // +X2C Class 155 :Servicios_Legajos_ExperienciaLaboral
 /**
 
 // +X2C Class 155 :Servicios_Legajos_ExperienciaLaboral
 /**


@@ -39,6 +38,7 @@ require_once 'DB.php';
  *
  * @access public
  */
  *
  * @access public
  */

+// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???

 class Servicios_Legajos_ExperienciaLaboral extends DB {
     /**
      * @var    int $agente
 class Servicios_Legajos_ExperienciaLaboral extends DB {
     /**
      * @var    int $agente


@@ -70,28 +70,27 @@ class Servicios_Legajos_ExperienciaLaboral extends DB {
     function Servicios_Legajos_ExperienciaLaboral($agente) // ~X2C
     {
         $this->agente = $agente;
     function Servicios_Legajos_ExperienciaLaboral($agente) // ~X2C
     {
         $this->agente = $agente;

-        $dsn = 'mysql://intranet:intranet@intranet-db/novedades';
-        $db = DB::connect($dsn);
+        $db = IntranetDB::connect();

         if (DB::isError($db)) 
         if (DB::isError($db)) 

-            die ($db->getMessage("No pudo conectarse a la base"));
+            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);

         $sql = "SELECT * 
         $sql = "SELECT * 

-                FROM web032
+                FROM novedades.web032

                 WHERE nrodoc = $agente
                 ORDER BY desde";
         $result_exp = $db->query($sql);
         if (DB::isError($result_exp))
                 WHERE nrodoc = $agente
                 ORDER BY desde";
         $result_exp = $db->query($sql);
         if (DB::isError($result_exp))

-            die ($result_exp->getMessage("Query mal hecho"));
+            trigger_error($result_exp->getMessage('Query mal hecho'), E_USER_ERROR);

 
         for ($fila = 0; $fila < $result_exp->numRows(); $fila++) {
             $this->experiencia[$fila] = $result_exp->fetchRow(DB_FETCHMODE_ASSOC);
         }
 
         $sql = "SELECT *
 
         for ($fila = 0; $fila < $result_exp->numRows(); $fila++) {
             $this->experiencia[$fila] = $result_exp->fetchRow(DB_FETCHMODE_ASSOC);
         }
 
         $sql = "SELECT *

-                FROM web031
+                FROM novedades.web031

                 WHERE nrodoc = $agente";
         $result_ant = $db->query($sql);
         if (DB::isError($result_ant))
                 WHERE nrodoc = $agente";
         $result_ant = $db->query($sql);
         if (DB::isError($result_ant))

-            die ($result_ant->getMessage("Query mal hecho"));
+            trigger_error($result_ant->getMessage('Query mal hecho'), E_USER_ERROR);

 
         if ($result_ant->numRows() > 0) {
             $this->antiguedad = $result_ant->fetchRow(DB_FETCHMODE_ASSOC);
 
         if ($result_ant->numRows() > 0) {
             $this->antiguedad = $result_ant->fetchRow(DB_FETCHMODE_ASSOC);


@@ -123,4 +122,4 @@ class Servicios_Legajos_ExperienciaLaboral extends DB {
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_ExperienciaLaboral
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_ExperienciaLaboral

-?>
\ No newline at end of file
+?>