[Fmsystem-commits] [14217] API: minor fixes

[Sigurd Nes]

Revision: 14217
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14217
Author:   sigurdne
Date:     2015-10-20 10:42:54 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
API: minor fixes

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php

Modified: branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.common.inc.php   2015-10-20 
00:36:04 UTC (rev 14216)
+++ branches/dev-syncromind/phpgwapi/inc/class.common.inc.php   2015-10-20 
10:42:54 UTC (rev 14217)
@@ -75,10 +75,10 @@
                * @param boolean $debug Debug flag
                * @return integer 1 when str2 is newest (bigger version number) 
than str1
                */
-               public function cmp_version_long($str1,$str2,$debug=False)
+               public function cmp_version_long($str1, $str2, $debug = false)
                {
-                       
preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)[a-z]*([0-9]*)\.([0-9]*)/i", $str1, 
$regs);
-                       
preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)[a-z]*([0-9]*)\.([0-9]*)/i", $str2, 
$regs2);
+                       $regs = explode('.', $str1);
+                       $regs2 = explode('.', $str2);
                        if($debug) { echo "<br />$regs[0] - $regs2[0]"; }
 
                        for($i=1;$i<6;++$i)

Modified: branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php      
2015-10-20 00:36:04 UTC (rev 14216)
+++ branches/dev-syncromind/phpgwapi/inc/class.schema_proc.inc.php      
2015-10-20 10:42:54 UTC (rev 14217)
@@ -308,6 +308,17 @@
                        return $this->m_odb->query($sQuery, $line, $file);
                }
 
+               function get_last_insert_id($table, $field = '')
+               {
+                       if($this->m_bDeltaOnly)
+                       {
+                               // Don't run this query, since we are 
processing deltas only
+                               return false;
+                       }
+
+                       return $this->m_odb->get_last_insert_id($table, $field);
+               }
+
                function _GetTableSQL($sTableName, $aTableDef, &$sTableSQL, 
&$sSequenceSQL, &$sTriggerSQL)
                {
                        global $DEBUG;