[Fmsystem-commits] [7541] catch: fix custom function

[Sigurd Nes]

Revision: 7541
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7541
Author:   sigurdne
Date:     2011-08-31 18:16:53 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
catch: fix custom function

Modified Paths:
--------------
    trunk/catch/inc/custom/default/update_location_at_record_nlsh.php

Modified: trunk/catch/inc/custom/default/update_location_at_record_nlsh.php
===================================================================
--- trunk/catch/inc/custom/default/update_location_at_record_nlsh.php   
2011-08-30 13:32:20 UTC (rev 7540)
+++ trunk/catch/inc/custom/default/update_location_at_record_nlsh.php   
2011-08-31 18:16:53 UTC (rev 7541)
@@ -13,7 +13,7 @@
                }
 
                $ids = array();
-               $this->db->query("SELECT id FROM $target_table WHERE 
location_code is NULL",__LINE__,__FILE__);
+               $this->db->query("SELECT id FROM $target_table WHERE 
(location_code is NULL OR location_code = '') OR (target_id IS NOT NULL AND 
location_id IS NOT NULL AND p_num IS NULL)",__LINE__,__FILE__);
                while ($this->db->next_record())
                {
                        $ids[] = $this->db->f('id');
@@ -27,6 +27,7 @@
 
                        $location_id = $this->db->f('location_id');
                        $target_id = $this->db->f('target_id');
+
                        if($location_id  && $target_id)
                        {
                                $origin = 
$GLOBALS['phpgw']->locations->get_name($location_id);