Changeset 7200 for extensions/GrumPluginClasses

Timestamp:

Oct 15, 2010, 5:59:23 PM (14 years ago)

Author:

grum

Message:

Add new possibilities for RBuilder modules

File:

• extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php (modified) (14 diffs)

extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

@@ -2 +2 @@
 /* -----------------------------------------------------------------------------
   class name: GCPRequestBuilder
-  class version  : 1.1.0
-  plugin version : 3.2.0
+  class version  : 1.1.1
+  plugin version : 3.3.2
   date           : 2010-09-08
 
@@ -68 +68 @@
 | 1.1.0   | 2010/09/08 | * add functionnalities to manage complex requests
 |         |            |
-|         |            |
-|         |            |
+| 1.1.1   | 2010/10/14 | * fix bug on the buildGroupRequest function
+|         |            |   . adding 'DISTINCT' keyword to the SQL requests
 |         |            |
 |         |            |
@@ -365 +365 @@
   `connected_plugin` char(255) NOT NULL,
   `filter` text NOT NULL,
+  `parameters` text NOT NULL,
   PRIMARY KEY  (`id`)
 )
@@ -396 +397 @@
   static public function updateTables($pluginPreviousRelease)
   {
-    $tablesCreate=array();
-    $tablesUpdate=array();
-
     switch($pluginPreviousRelease)
     {
       case '03.01.00':
+        $tablesCreate=array();
+        $tablesUpdate=array();
+
         $tablesCreate[]=
 "CREATE TABLE `".self::$tables['temp']."` (
@@ -412 +413 @@
         $tablesUpdate[self::$tables['request']]['filter']=
 "ADD COLUMN  `filter` text NOT NULL default '' ";
-        break;
-    }
-
-    $tablef=new GPCTables(array(self::$tables['temp']));
-
-    if(count($tablesCreate)>0) $tablef->create($tablesCreate);
-    if(count($tablesUpdate)>0) $tablef->updateTablesFields($tablesUpdate);
+
+
+        $tablef=new GPCTables(array(self::$tables['temp']));
+
+        $tablef->create($tablesCreate);
+        $tablef->updateTablesFields($tablesUpdate);
+        // no break ! need to be updated like the next release
+        // break;
+      case '03.01.01':
+      case '03.02.00':
+      case '03.02.01':
+      case '03.03.00':
+      case '03.03.01':
+        $tablesUpdate=array();
+
+        $tablesUpdate[self::$tables['request']]['parameters']=
+"ADD COLUMN `parameters` TEXT NOT NULL AFTER `filter`";
+
+        $tablef->updateTablesFields($tablesUpdate);
+        // no break ! need to be updated like the next release
+        // break;
+    }
 
     return(true);
@@ -728 +744 @@
     {
       $numberItems=pwg_db_changes($result);
-      self::updateRequest($requestNumber, $numberItems, 0, implode(',', $pluginList), $build['FILTER']);
+      self::updateRequest($requestNumber, $numberItems, 0, implode(',', $pluginList), $build['FILTER'], $_REQUEST['extraData']);
 
       $returned="$requestNumber;".$numberItems;
@@ -796 +812 @@
     );
 
+
+    $extraData=array();
+    foreach($request['parameters'] as $data)
+    {
+      $extraData[$data['owner']]=$data['param'];
+    }
+
     /* for each needed plugin :
      *  - include the file
@@ -808 +831 @@
           include_once($registeredPlugin[$val]['fileName']);
 
-          $tmp=explode(',', call_user_func(Array('RBCallBack'.$val, 'getSelect')));
+          $tmp=explode(',', call_user_func(Array('RBCallBack'.$val, 'getSelect'), $extraData[$val]));
           foreach($tmp as $key2=>$val2)
           {
@@ -814 +837 @@
           }
           $tmpBuild['SELECT'][$val]=implode(',', $tmp);
-          $tmpBuild['FROM'][$val]=call_user_func(Array('RBCallBack'.$val, 'getFrom'));
-          $tmpBuild['JOIN'][$val]=call_user_func(Array('RBCallBack'.$val, 'getJoin'));
+          $tmpBuild['FROM'][$val]=call_user_func(Array('RBCallBack'.$val, 'getFrom'), $extraData[$val]);
+          $tmpBuild['JOIN'][$val]=call_user_func(Array('RBCallBack'.$val, 'getJoin'), $extraData[$val]);
         }
       }
@@ -1044 +1067 @@
   static private function getNewRequest($userId)
   {
-    $sql="INSERT INTO ".self::$tables['request']." VALUES('', '$userId', '".date('Y-m-d H:i:s')."', 0, 0, '', '')";
+    $sql="INSERT INTO ".self::$tables['request']." VALUES('', '$userId', '".date('Y-m-d H:i:s')."', 0, 0, '', '', '')";
     $result=pwg_query($sql);
     if($result)
@@ -1060 +1083 @@
    * @param Float $executionTime : time in second to execute the request
    * @param String $pluginList : list of used plugins
+   * @param String $parameters : parameters given for the request
    * @return Boolean : true if request was updated, otherwise false
    */
-  static private function updateRequest($requestId, $numItems, $executionTime, $pluginList, $additionalFilter)
+  static private function updateRequest($requestId, $numItems, $executionTime, $pluginList, $additionalFilter, $parameters)
   {
     $sql="UPDATE ".self::$tables['request']."
@@ -1068 +1092 @@
                 execution_time = $executionTime,
                 connected_plugin = '$pluginList',
-                filter = '".mysql_escape_string($additionalFilter)."'
+                filter = '".mysql_escape_string($additionalFilter)."',
+                parameters = '".serialize($parameters)."'
             WHERE id = $requestId";
     $result=pwg_query($sql);
@@ -1087 +1112 @@
   {
     $returned=false;
-    $sql="SELECT user_id, date, num_items, execution_time, connected_plugin, filter
+    $sql="SELECT user_id, date, num_items, execution_time, connected_plugin, filter, parameters
           FROM ".self::$tables['request']."
           WHERE id = $requestId";
@@ -1095 +1120 @@
       while($row=pwg_db_fetch_assoc($result))
       {
+        if($row['parameters']!='') $row['parameters']=unserialize($row['parameters']);
         $returned=$row;
       }