[Erp5-report] r26455 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...

[nobody at svn.erp5.org]

Author: romain
Date: Thu Apr 16 10:12:15 2009
New Revision: 26455

URL: http://svn.erp5.org?rev=26455&view=rev
Log:
Remove an useless JOIN.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml?rev=26455&r1=26454&r2=26455&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml [utf8] Thu Apr 16 10:12:15 2009
@@ -176,6 +176,14 @@
         my_versioning.version,\n
         catalog.creation_date,\n
         catalog.title,\n
+        <dtml-if all_versions>\n
+        <dtml-else>\n
+        CONCAT(CASE my_versioning.language\n
+                   WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
+                   WHEN \'en\' THEN \'2\'\n
+                   ELSE \'1\' END,\n
+            my_versioning.version) AS current_priority,\n
+        </dtml-if>\n
         MAX(CONCAT(CASE my_versioning.language\n
                    WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
                    WHEN \'en\' THEN \'2\'\n
@@ -207,23 +215,13 @@
         catalog.uid\n
       ORDER BY\n
         priority DESC\n
-    ) AS catalog,\n
-      versioning AS my_versioning\n
-\n
-  WHERE\n
-    catalog.uid = my_versioning.uid\n
+    ) AS catalog\n
+\n
   <dtml-if all_versions>\n
-    GROUP BY\n
-      catalog.uid\n
   <dtml-else>\n
-    GROUP BY\n
-      catalog.reference\n
-    HAVING\n
-      MAX(CONCAT(CASE my_versioning.language\n
-                 WHEN  <dtml-sqlvar language type="string"> THEN \'3\'\n
-                 WHEN \'en\' THEN \'2\'\n
-                 ELSE \'1\' END,\n
-          my_versioning.version)) = catalog.priority\n
+    WHERE\n
+      catalog.priority = catalog.current_priority\n
+    GROUP BY reference\n
   </dtml-if>\n
 \n
   ORDER BY\n
@@ -233,9 +231,9 @@
     <dtml-else>\n
       <dtml-var "query[\'order_by_expression\']">\n
     </dtml-if>\n
-  <dtml-else>\n
-    catalog.int_index,\n
-    catalog.reference\n
+  <dtml-else> \t \t \n
+     catalog.int_index,\n
+     catalog.reference\n
   </dtml-if>\n
 \n
   <dtml-if "query[\'limit_expression\']">\n
@@ -323,6 +321,14 @@
         my_versioning.version,\n
         catalog.creation_date,\n
         catalog.title,\n
+        <dtml-if all_versions>\n
+        <dtml-else>\n
+        CONCAT(CASE my_versioning.language\n
+                   WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
+                   WHEN \'en\' THEN \'2\'\n
+                   ELSE \'1\' END,\n
+            my_versioning.version) AS current_priority,\n
+        </dtml-if>\n
         MAX(CONCAT(CASE my_versioning.language\n
                    WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
                    WHEN \'en\' THEN \'2\'\n
@@ -354,23 +360,13 @@
         catalog.uid\n
       ORDER BY\n
         priority DESC\n
-    ) AS catalog,\n
-      versioning AS my_versioning\n
-\n
-  WHERE\n
-    catalog.uid = my_versioning.uid\n
+    ) AS catalog\n
+\n
   <dtml-if all_versions>\n
-    GROUP BY\n
-      catalog.uid\n
   <dtml-else>\n
-    GROUP BY\n
-      catalog.reference\n
-    HAVING\n
-      MAX(CONCAT(CASE my_versioning.language\n
-                 WHEN  <dtml-sqlvar language type="string"> THEN \'3\'\n
-                 WHEN \'en\' THEN \'2\'\n
-                 ELSE \'1\' END,\n
-          my_versioning.version)) = catalog.priority\n
+    WHERE\n
+      catalog.priority = catalog.current_priority\n
+    GROUP BY reference\n
   </dtml-if>\n
 \n
   ORDER BY\n
@@ -380,9 +376,9 @@
     <dtml-else>\n
       <dtml-var "query[\'order_by_expression\']">\n
     </dtml-if>\n
-  <dtml-else>\n
-    catalog.int_index,\n
-    catalog.reference\n
+  <dtml-else> \t \t \n
+     catalog.int_index,\n
+     catalog.reference\n
   </dtml-if>\n
 \n
   <dtml-if "query[\'limit_expression\']">\n

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=26455&r1=26454&r2=26455&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Thu Apr 16 10:12:15 2009
@@ -1,1 +1,1 @@
-779
+791