Se mejora:

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

diff --git a/sistema/local_lib/Servicios/Legajos/Familiares.php b/sistema/local_lib/Servicios/Legajos/Familiares.php
index 782dddf433640f080f8fa85b038ac2ba179045fe..1e2bceab1f9af49bdf616c5652c2fcff20aac9a6 100644 (file)
--- a/sistema/local_lib/Servicios/Legajos/Familiares.php
+++ b/sistema/local_lib/Servicios/Legajos/Familiares.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,23 +20,23 @@
 // | 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_Familiares.php 23 2003-07-15 18:56:42Z msklar $
 //
 
 // +--------------------------------------------------------------------+
 //
 // $Id: Intranet_Legajos_Familiares.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 154 :Servicios_Legajos_Familiares
 /**
  * @access public
  */
 
 // +X2C Class 154 :Servicios_Legajos_Familiares
 /**
  * @access public
  */

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

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


@@ -62,16 +62,15 @@ class Servicios_Legajos_Familiares extends DB {
     function Servicios_Legajos_Familiares($agente) // ~X2C
     {
         $this->agente = $agente;
     function Servicios_Legajos_Familiares($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 web004
+                FROM novedades.web004

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

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

 
         for ($fila = 0; $fila < $result->numRows(); $fila++) {
             $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);
 
         for ($fila = 0; $fila < $result->numRows(); $fila++) {
             $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);


@@ -90,7 +89,7 @@ class Servicios_Legajos_Familiares extends DB {
         $fila = 0;
         if(is_array($this->datos)) {
             foreach (array_keys($this->datos) as $key) {
         $fila = 0;
         if(is_array($this->datos)) {
             foreach (array_keys($this->datos) as $key) {

-                if($this->datos[$key]['parentesco']=="H") {
+                if($this->datos[$key]['parentesco']=='H') {

                  $aux[$fila]['nombre'] = $this->datos[$key]['nombre'];
                  $aux[$fila]['tipo_doc'] = $this->datos[$key]['tipodoc'];
                  $aux[$fila]['nro_doc'] = $this->datos[$key]['nrodoc'];
                  $aux[$fila]['nombre'] = $this->datos[$key]['nombre'];
                  $aux[$fila]['tipo_doc'] = $this->datos[$key]['tipodoc'];
                  $aux[$fila]['nro_doc'] = $this->datos[$key]['nrodoc'];


@@ -130,4 +129,4 @@ class Servicios_Legajos_Familiares extends DB {
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_Familiares
     // -X2C
 
 } // -X2C Class :Servicios_Legajos_Familiares

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