Changeset 11152 for branches/2.2/include/ws_functions.inc.php

Timestamp:

May 31, 2011, 10:21:08 PM (13 years ago)

Author:

plg

Message:

feature 1622 added: pwg.categories.getList is now able to return a tree with
the new "tree_output" option. Only compatible with json/php output formats.

File:

• branches/2.2/include/ws_functions.inc.php (modified) (3 diffs)

branches/2.2/include/ws_functions.inc.php

@@ -433 +433 @@
   global $user,$conf;
 
+  if ($params['tree_output'])
+  {
+    if (!isset($_GET['format']) or !in_array($_GET['format'], array('php', 'json')))
+    {
+      // the algorithm used to build a tree from a flat list of categories
+      // keeps original array keys, which is not compatible with
+      // PwgNamedArray.
+      //
+      // PwgNamedArray is useful to define which data is an attribute and
+      // which is an element in the XML output. The "hierarchy" output is
+      // only compatible with json/php output.
+      
+      return new PwgError(405, "The tree_output option is only compatible with json/php output formats");
+    }
+  }
+
   $where = array('1=1');
   $join_type = 'INNER';
@@ -472 +488 @@
 
   $query = '
-SELECT id, name, permalink, uppercats, global_rank,
+SELECT id, name, permalink, uppercats, global_rank, id_uppercat,
     comment,
     nb_images, count_images AS total_nb_images,
@@ -515 +531 @@
   }
   usort($cats, 'global_rank_compare');
-  return array(
-    'categories' => new PwgNamedArray(
-      $cats,
-      'category',
-      array(
-        'id',
-        'url',
-        'nb_images',
-        'total_nb_images',
-        'nb_categories',
-        'date_last',
-        'max_date_last',
+
+  if ($params['tree_output'])
+  { 
+    return categories_flatlist_to_tree($cats);
+  }
+  else
+  {
+    return array(
+      'categories' => new PwgNamedArray(
+        $cats,
+        'category',
+        array(
+          'id',
+          'url',
+          'nb_images',
+          'total_nb_images',
+          'nb_categories',
+          'date_last',
+          'max_date_last',
+          )
         )
-      )
-    );
+      );
+  }
 }