[Fmsystem-commits] [15768] Stable: Merge 15765:15767 from trunk

[sigurdne]

Revision: 15768
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15768
Author:   sigurdne
Date:     2016-09-30 09:24:54 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
Stable: Merge 15765:15767 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php

Removed Paths:
-------------
    
branches/Version-2_0-branch/phpgwapi/js/jquery/file-upload/server/php/files/737-Utend?\195?\131?\194?\184rs
 forsyningsanlegg for termisk energi.png
    
branches/Version-2_0-branch/phpgwapi/js/jquery/file-upload/server/php/files/thumbnail/737-Utend?\195?\131?\194?\184rs
 forsyningsanlegg for termisk energi.png

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15747
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15747
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767

Deleted: 
branches/Version-2_0-branch/phpgwapi/js/jquery/file-upload/server/php/files/737-Utend?\195?\131?\194?\184rs
 forsyningsanlegg for termisk energi.png
===================================================================
(Binary files differ)

Deleted: 
branches/Version-2_0-branch/phpgwapi/js/jquery/file-upload/server/php/files/thumbnail/737-Utend?\195?\131?\194?\184rs
 forsyningsanlegg for termisk energi.png
===================================================================
(Binary files differ)

Modified: branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php
===================================================================
--- branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php  
2016-09-30 09:09:29 UTC (rev 15767)
+++ branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php  
2016-09-30 09:24:54 UTC (rev 15768)
@@ -76,12 +76,27 @@
 
        $location_id = phpgw::get_var('location_id', 'int');
        $section = phpgw::get_var('section', 'string');
-       $bygningsnr = (int)phpgw::get_var('bygningsnr', 'int');
        $fileid = phpgw::get_var('fileid', 'string');
 
-       if (!$fileid && !$bygningsnr)
+       $where_parameter =  phpgw::get_var('where_parameter', 'string');
+
+       $_where = '';
+       if (!$fileid)
        {
-               $GLOBALS['phpgw_info']['message']['errors'][] = 
"{$system_name}::Bygningsnr ikke angitt som innparameter";
+               if ($where_parameter)
+               {
+                       $_where = "{$where_parameter} = ". 
phpgw::get_var($where_parameter);
+               }
+               else
+               {
+                       $bygningsnr = (int)phpgw::get_var('bygningsnr', 'int');
+                       $_where = "Byggnr = {$bygningsnr}";
+               }
+
+               if (!$_where)
+               {
+                       $GLOBALS['phpgw_info']['message']['errors'][] = 
"{$system_name}::Mangler innparameter for avgrensing av listesøk";
+               }
        }
 
        $c = CreateObject('admin.soconfig', $location_id);
@@ -175,7 +190,7 @@
        }
        $bra5ServiceSearch = new Bra5ServiceSearch();
        /*
-         if($bra5ServiceSearch->searchDocument(new 
Bra5StructSearchDocument($secKey,$_baseclassname = 
'Eiendomsarkiver',$classname,$_where = "Byggnr = {$bygningsnr}",$_maxhits = 2)))
+         if($bra5ServiceSearch->searchDocument(new 
Bra5StructSearchDocument($secKey,$_baseclassname = 
'Eiendomsarkiver',$classname,$_where,$_maxhits = 2)))
          {
          //            _debug_array($bra5ServiceSearch->getResult());
          }
@@ -184,7 +199,7 @@
          print_r($bra5ServiceSearch->getLastError());
          }
         */
-       if ($bra5ServiceSearch->searchAndGetDocuments(new 
Bra5StructSearchAndGetDocuments($secKey, $_baseclassname = 'Eiendomsarkiver', 
$classname, $_where = "Byggnr = {$bygningsnr}", $_maxhits = -1)))
+       if ($bra5ServiceSearch->searchAndGetDocuments(new 
Bra5StructSearchAndGetDocuments($secKey, $_baseclassname = 'Eiendomsarkiver', 
$classname, $_where, $_maxhits = -1)))
        {
 //             _debug_array($bra5ServiceSearch->getResult());die();
                $_result = 
$bra5ServiceSearch->getResult()->getsearchAndGetDocumentsResult()->getExtendedDocument()->getsearchAndGetDocumentsResult()->ExtendedDocument;