Changeset 6208 for extensions

Timestamp:

May 17, 2010, 7:46:39 PM (14 years ago)

Author:

grum

Message:

Fix some bugs on the request builder and improve results display

Location:

extensions/GrumPluginClasses

Files:

• classes/GPCRequestBuilder.class.inc.php (modified) (8 diffs)
• js/criteriaBuilder.js (modified) (1 diff)
• templates/GPCRequestBuilder_result.tpl (modified) (1 diff)
• templates/GPCRequestBuilder_search.tpl (modified) (1 diff)
• templates/GPCTabSheet.tpl (modified) (2 diffs)

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

@@ -366 +366 @@
     if($clearAll)
     {
-      $sql="DELETE FROM ".$this->tables['result_cache'];
+      $sql="DELETE FROM ".self::$tables['result_cache'];
     }
     else
     {
-      $sql="DELETE FROM ".$this->tables['result_cache']." pgrc, ".$this->tables['request']." pgr
-            WHERE pgrc.id = pgr.id
-              AND pgr.date < '".date('Y-m-d H:i:s', strtotime("-2 hour"))."'";
+      $sql="DELETE pgrc FROM ".self::$tables['result_cache']." pgrc
+              LEFT JOIN ".self::$tables['request']." pgr
+                ON pgrc.id = pgr.id
+              WHERE pgr.date < '".date('Y-m-d H:i:s', strtotime("-2 hour"))."'";
     }
     pwg_query($sql);
@@ -386 +387 @@
   {
     global $user;
+
+    self::clearCache();
 
     $registeredPlugin=self::getRegistered();
@@ -428 +431 @@
     {
       $pluginNeeded[$val['owner']][$key]=$_REQUEST['extraData'][$key]['param'];
-      $pluginList[]=$val['owner'];
+      $pluginList[$val['owner']]=$val['owner'];
     }
 
@@ -512 +515 @@
       self::updateRequest($requestNumber, $numberItems, 0, implode(',', $pluginList));
 
+
       return("$requestNumber;".$numberItems);
     }
 
-    self::clearCache();
-
-    return($sql);
+    return("0;0");
   }
 
@@ -538 +540 @@
     }
 
-    $limitFrom=$numPerPage*($pageNumber-1)+1;
-    $limitTo=$numPerPage*$pageNumber;
+    $limitFrom=$numPerPage*($pageNumber-1);
 
     $pluginNeeded=explode(',', $request['connected_plugin']);
@@ -554 +555 @@
         'RB_PIT' => "pit.id AS imageId, pit.name AS imageName, pit.path AS imagePath", // from the piwigo's image table
         'RB_PIC' => "GROUP_CONCAT(pic.category_id SEPARATOR ',') AS imageCategoriesId",     // from the piwigo's image_category table
-        'RB_PCT' => "GROUP_CONCAT(pct.name SEPARATOR '#sep#') AS imageCategoriesNames",   //from the piwigo's categories table
+        'RB_PCT' => "GROUP_CONCAT(CASE WHEN pct.name IS NULL THEN '' ELSE pct.name END SEPARATOR '#sep#') AS imageCategoriesNames,
+                     GROUP_CONCAT(CASE WHEN pct.permalink IS NULL THEN '' ELSE pct.permalink END SEPARATOR '#sep#') AS imageCategoriesPLink,
+                     GROUP_CONCAT(CASE WHEN pct.dir IS NULL THEN 'V' ELSE 'P' END) AS imageCategoriesDir",   //from the piwigo's categories table
       ),
       'FROM' => Array(
@@ -635 +638 @@
         .' GROUP BY '.$build['GROUPBY']
         .' ORDER BY pit.id '
-        .' LIMIT '.$limitFrom.', '.$limitTo;
+        .' LIMIT '.$limitFrom.', '.$numPerPage;
 
     $result=pwg_query($sql);
@@ -647 +650 @@
         $datas['imagePath']=$row['imagePath'];
         $datas['imageName']=$row['imageName'];
+
         $datas['imageCategoriesId']=explode(',', $row['imageCategoriesId']);
         $datas['imageCategoriesNames']=explode('#sep#', $row['imageCategoriesNames']);
+        $datas['imageCategoriesPLink']=explode('#sep#', $row['imageCategoriesPLink']);
+        $datas['imageCategoriesDir']=explode(',', $row['imageCategoriesDir']);
+
+
+        $datas['imageCategories']=Array();
+        for($i=0;$i<count($datas['imageCategoriesId']);$i++)
+        {
+          $datas['imageCategories'][]=array(
+            'id' => $datas['imageCategoriesId'][$i],
+            'name' => $datas['imageCategoriesNames'][$i],
+            'dirType' => $datas['imageCategoriesDir'][$i],
+            'pLinks' => $datas['imageCategoriesPLink'][$i],
+            'link'=> make_index_url(
+                              array(
+                                'category' => array(
+                                  'id' => $datas['imageCategoriesId'][$i],
+                                  'name' => $datas['imageCategoriesNames'][$i],
+                                  'permalink' => $datas['imageCategoriesPLink'][$i])
+                              )
+                            )
+          );
+        }
 
         /* affect datas for each plugin

extensions/GrumPluginClasses/js/criteriaBuilder.js

@@ -305 +305 @@
     {
       $('#'+itemId).remove();
+      re=/[0-9]*$/;
+      extraData[eval(re.exec(itemId)[0])]=null;
       manage();
     }

extensions/GrumPluginClasses/templates/GPCRequestBuilder_result.tpl

@@ -5 +5 @@
       <tr>
         <td>
-          <img src='{$row.imageThumbnail}'>
+          <img class="thumbnail" src='{$row.imageThumbnail}'>
         </td>
 
         <td class="rbResultItemDetail">
-          {$row.imageId}<br>
-          {$row.imageName}<br>
-          {$row.imagePath}<br>
-          {$row.imageCategories}<br>
+          {if $row.imageName!=''}{$row.imageName}<br>{/if}
+          {foreach from=$row.imageCategories key=catname item=catdata name=catlist}
+<a href="{$catdata.link}">{$catdata.name}</a>{if $smarty.foreach.catlist.last}<br/>{else},&nbsp;{/if}
+          {/foreach}
           <hr>
           {foreach from=$row.plugin item=plugin}

extensions/GrumPluginClasses/templates/GPCRequestBuilder_search.tpl

@@ -149 +149 @@
       {
         $('#iResultQueryContent').html(nfo);
+        $('.tiptip').tipTip(
+          {
+            'delay' : 0,
+            'fadeIn' : 0,
+            'fadeOut' : 0,
+            'edgeOffset' : 5,
+          }
+        );
       }
       else

extensions/GrumPluginClasses/templates/GPCTabSheet.tpl

@@ -2 +2 @@
 <ul {if isset($tabsheet_classes)}class="{$tabsheet_classes}"{/if} {if isset($tabsheet_id)}id="{$tabsheet_id}"{/if} >
 {foreach from=$tabsheet key=name item=sheet name=tabs}
-  <li {if isset($tabsheet_id)}id="{$tabsheet_id}{$smarty.foreach.tabs.index}"{/if} class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}">
+  <li class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}">
     <a {if $sheet.url!=''}href="{$sheet.url}"{/if} {if $sheet.onClick!=''}onclick="{$sheet.onClick}"{/if} ><span>{$sheet.caption}</span></a>
   </li>
@@ -11 +11 @@
   {literal}
   <script type="text/javascript">
-    $('#{/literal}{$tabsheet_id}{literal} li').bind('click',
+    $('#{/literal}{$tabsheet_id}{literal} li a').bind('click',
       function ()
       {
         $('#{/literal}{$tabsheet_id}{literal} li').removeClass('selected_tab').addClass('normal_tab');
-        $(this).removeClass('normal_tab').addClass('selected_tab');
+        $(this.parentNode).removeClass('normal_tab').addClass('selected_tab');
       }
     );