Corregi un bug producido cuando el agente pedido era contratado.

[mecon/meconlib.git] / lib / MECON / Agente.php

diff --git a/lib/MECON/Agente.php b/lib/MECON/Agente.php
index 994dc205ba4067440ce43ddae9a72d931484c38e..fff7cbd5220d838de6e192a8bfa59ea016f2f8a5 100644 (file)
--- a/lib/MECON/Agente.php
+++ b/lib/MECON/Agente.php
@@ -1,39 +1,35 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Created: Thu Jun 19 15:17:11 2003
-// | Author:  Gonzalo Merayo <gmeray@mecon.gov.ar>
-// +----------------------------------------------------------------------+
-//
-// $Id$
-// $Author$
-// $URL$
-// $Date$
-// $Rev$
-//
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 textwidth=80:
+-------------------------------------------------------------------------------
+                             Ministerio de Economía
+                                    meconlib
+-------------------------------------------------------------------------------
+This file is part of meconlib.
+
+meconlib 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.
+
+meconlib 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.
+ 
+You should have received a copy of the GNU General Public License; if not,
+write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA  02111-1307  USA
+-------------------------------------------------------------------------------
+Creado: Thu Jun 19 15:17:11 2003
+Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/

 
 #require_once 'PEAR.php';
 require_once 'DB.php';
 require_once 'MECON/Tiempo/Hora.php';
 
 
 #require_once 'PEAR.php';
 require_once 'DB.php';
 require_once 'MECON/Tiempo/Hora.php';
 

-
-
-

 // +X2C Class 131 :Agente
 /**
 // +X2C Class 131 :Agente
 /**

- * @package

  * @access public
  */
 class Agente {
  * @access public
  */
 class Agente {


@@ -69,7 +65,7 @@ class Agente {
      */
     function getTipo() // ~X2C
   {
      */
     function getTipo() // ~X2C
   {

-      if(is_null($this->datos['tipo_agente']))
+      if(!in_array('tipo_agente',array_keys($this->datos)))

         return 'CON '.$this->datos['marco_legal'];
       else
         return $this->datos['tipo_agente'];
         return 'CON '.$this->datos['marco_legal'];
       else
         return $this->datos['tipo_agente'];


@@ -86,11 +82,8 @@ class Agente {
      */
     function Agente($agente) // ~X2C
   {
      */
     function Agente($agente) // ~X2C
   {

-      if($agente !== null) {
-        buscarAgente($agente);
-      }else {
-            trigger_error("No se paso ningun documento!"); 
-      }
+      if(! is_null($agente))
+        $this->buscarAgente($agente);

   }
   // -X2C
 
   }
   // -X2C
 


@@ -178,8 +171,11 @@ class Agente {
             $aux['fecha_nac_conyuge'] = $this->datos['fecha_nac_cony']; 
             $aux['tipo_doc_conyuge'] = $this->datos['tipodoc_cony']; 
             $aux['nro_doc_cony'] = $this->datos['nrodoc_cony']; 
             $aux['fecha_nac_conyuge'] = $this->datos['fecha_nac_cony']; 
             $aux['tipo_doc_conyuge'] = $this->datos['tipodoc_cony']; 
             $aux['nro_doc_cony'] = $this->datos['nrodoc_cony']; 

+            return $aux;
+        }else
+        {
+            return false;

         }
         }

-        return $aux;

     }
     // -X2C
 
     }
     // -X2C
 


@@ -222,10 +218,11 @@ class Agente {
             $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC);
           }
          else
             $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC);
           }
          else

-            trigger_error("Ahhhhh, agente no encontrado!"); 
+            return false;

       }
       }

+      return true;

     }
     // -X2C
 
 } // -X2C Class :Agente
     }
     // -X2C
 
 } // -X2C Class :Agente

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