[Phpgroupware-cvs] CVS: property/inc class.sodocument.inc.php,1.3,1.4 class.sodrawing.inc.php,1.4,1.5

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv20694/inc

Modified Files:
        class.sodocument.inc.php class.sodrawing.inc.php 
Log Message:
no message

Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sodocument.inc.php    29 Apr 2003 12:41:31 -0000      1.3
--- class.sodocument.inc.php    30 Apr 2003 09:50:02 -0000      1.4
***************
*** 130,138 ****
                        if ($cat_id == 'equipment'):
                        {
!                               $filtermethod .= " AND fm_document.equipment_id 
is not NULL ";
                        }
                        elseif ($cat_id == 'location'):
                        {
!                               $filtermethod .= " AND fm_document.equipment_id 
is NULL ";
                        }
                        else:
--- 130,138 ----
                        if ($cat_id == 'equipment'):
                        {
!                               $filtermethod .= " AND 
(fm_document.equipment_id is not NULL AND fm_document.equipment_id !='')";
                        }
                        elseif ($cat_id == 'location'):
                        {
!                               $filtermethod .= " AND ( 
fm_document.equipment_id is NULL OR fm_document.equipment_id='') ";
                        }
                        else:
***************
*** 436,440 ****
  //echo $file;
                        if($this->vfs->file_exists(array(
!                                       'string' => $this->fakebase. SEP . 
'document'. SEP . $document_name,
                                        'relatives' => Array(RELATIVE_NONE)
                                )))
--- 436,440 ----
  //echo $file;
                        if($this->vfs->file_exists(array(
!                                       'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)
                                )))
***************
*** 443,447 ****
  
                                if(!$this->vfs->rm (array(
!                                       'string' => $this->fakebase. SEP . 
'document'. SEP . $document_name,
                                     'relatives' => array(
                                          RELATIVE_NONE
--- 443,447 ----
  
                                if(!$this->vfs->rm (array(
!                                       'string' => $file,
                                     'relatives' => array(
                                          RELATIVE_NONE

Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sodrawing.inc.php     22 Apr 2003 09:06:54 -0000      1.4
--- class.sodrawing.inc.php     30 Apr 2003 09:50:02 -0000      1.5
***************
*** 153,162 ****
                        $sql = "SELECT * FROM fm_drawing WHERE  $filtermethod 
$querymethod";
  
- /*                    $sql = "SELECT  span_tegning.fullt_filnavn, 
span_tegning.objekt_id as objekt_id, span_tegning.bygg_id as bygg_id, 
span_tegning.seksjons_id as seksjons_id, span_tegning.etasje_id, 
span_tegning.tegningsfil, boei_seksjon.beskrivelse FROM "
-                               . " boei_seksjon $this->join span_tegning ON 
(boei_seksjon.seksjons_id = span_tegning.seksjons_id) AND (boei_seksjon.bygg_id 
= span_tegning.bygg_id) AND (boei_seksjon.objekt_id = span_tegning.objekt_id) "
-                               . " $location $querymethod $fand $filtermethod";
- 
- */
- 
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();
--- 153,156 ----