[Phpgroupware-cvs] property/inc/import Import_fra_Service_xml, 1.12 Import_fra_Service, 1.12

[sigurdne]

Update of property/inc/import

Modified Files:
     Branch: MAIN
            Import_fra_Service_xml lines: +6 -2
            Import_fra_Service lines: +6 -2

Log Message:
no message

====================================================
Index: property/inc/import/Import_fra_Service_xml
diff -u property/inc/import/Import_fra_Service_xml:1.11 
property/inc/import/Import_fra_Service_xml:1.12
--- property/inc/import/Import_fra_Service_xml:1.11     Thu Jan 13 16:52:48 2005
+++ property/inc/import/Import_fra_Service_xml  Tue Feb  8 13:12:53 2005
@@ -241,7 +241,7 @@
                        $loc1=substr($id,0,4);
                        $loc2=substr($id,4,2);

-                       $this->db->query("select loc1 from fm_location1 where 
loc1='$loc1'");
+                       $this->db->query("select loc1 from fm_location1 where 
loc1='$loc1' AND ((fm_location1.category <> 99) OR (fm_location1.category IS 
NULL))");
                        $this->db->next_record();
                        if ($this->db->f('loc1'))
                        {
@@ -249,12 +249,16 @@

                                if ($loc2)
                                {
-                                       $this->db->query("select location_code 
from fm_location2 where loc1='$loc1' AND loc2='$loc2'");
+                                       $this->db->query("select location_code 
from fm_location2 where loc1='$loc1' AND loc2='$loc2'  AND 
((fm_location2.category <> 99) OR (fm_location2.category IS NULL))");
                                        $this->db->next_record();
                                        if ($this->db->f('location_code'))
                                        {
                                                $dima = 
str_replace('-','',$this->db->f('location_code'));
                                        }
+                                       else
+                                       {
+                                               unset($dima);
+                                       }
                                }
                        }


====================================================
Index: property/inc/import/Import_fra_Service
diff -u property/inc/import/Import_fra_Service:1.11 
property/inc/import/Import_fra_Service:1.12
--- property/inc/import/Import_fra_Service:1.11 Thu Jan 13 16:52:48 2005
+++ property/inc/import/Import_fra_Service      Tue Feb  8 13:12:53 2005
@@ -227,7 +227,7 @@
                        $loc1=substr($id,0,4);
                        $loc2=substr($id,4,2);

-                       $this->db->query("select loc1 from fm_location1 where 
loc1='$loc1'");
+                       $this->db->query("select loc1 from fm_location1 where 
loc1='$loc1' AND ((fm_location1.category <> 99) OR (fm_location1.category IS 
NULL))");
                        $this->db->next_record();
                        if ($this->db->f('loc1'))
                        {
@@ -235,12 +235,16 @@

                                if ($loc2)
                                {
-                                       $this->db->query("select location_code 
from fm_location2 where loc1='$loc1' AND loc2='$loc2'");
+                                       $this->db->query("select location_code 
from fm_location2 where loc1='$loc1' AND loc2='$loc2'  AND 
((fm_location2.category <> 99) OR (fm_location2.category IS NULL))");
                                        $this->db->next_record();
                                        if ($this->db->f('location_code'))
                                        {
                                                $dima = 
str_replace('-','',$this->db->f('location_code'));
                                        }
+                                       else
+                                       {
+                                               unset($dima);
+                                       }
                                }
                        }