Changeset 2553

Timestamp:

Sep 20, 2008, 12:59:41 AM (16 years ago)

Author:

plg

Message:

improvement: instead of sending the images_max_rank of each category in
pwg.categories.getList so that you can correctly set the rank in
pwg.images.add, the rank is calculated automatically in pwg.images.add so
that the image is added at the end of the category.

Location:

trunk

Files:

• include/ws_functions.inc.php (modified) (5 diffs)
• tools/piwigo_remote.pl (modified) (2 diffs)

trunk/include/ws_functions.inc.php

@@ -365 +365 @@
   global $user,$conf;
 
-  $query = '
-SELECT
-    category_id,
-    MAX(rank) AS max_rank
-  FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE rank IS NOT NULL
-  GROUP BY category_id
-;';
-  $max_image_rank_of = simple_hash_from_query(
-    $query,
-    'category_id',
-    'max_rank'
-    );
-
   $where = array();
 
@@ -429 +415 @@
     {
       $row[$key] = (int)$row[$key];
-    }
-
-    if (isset($max_image_rank_of[ $row['id'] ]))
-    {
-      $row['images_max_rank'] = $max_image_rank_of[ $row['id'] ];
     }
     
@@ -451 +432 @@
         'date_last',
         'max_date_last',
-        'images_max_rank',
         )
       )
@@ -863 +843 @@
   // $fh_log = fopen('/tmp/php.log', 'w');
   // fwrite($fh_log, time()."\n");
+  // fwrite($fh_log, 'input rank :'.$params['rank']."\n");
   // fwrite($fh_log, 'input:  '.$params['file_sum']."\n");
   // fwrite($fh_log, 'input:  '.$params['thumbnail_sum']."\n");
@@ -959 +940 @@
     'category_id' => $params['category_id'],
     'image_id' => $image_id,
-    'rank' => $params['rank'],
-    );
+    );
+
+  if ('auto' == $params['rank'])
+  {
+    $query = '
+SELECT
+    MAX(rank) AS max_rank
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE rank IS NOT NULL
+    AND category_id = '.$params['category_id'].'
+;';
+    $row = mysql_fetch_assoc(pwg_query($query));
+    $insert['rank'] = isset($row['max_rank']) ? $row['max_rank']+1 : 1;
+  }
+  else if (is_numeric($params['rank']))
+  {
+    $insert['rank'] = (int)$params['rank'];
+  }
+  
   mass_inserts(
     IMAGE_CATEGORY_TABLE,

trunk/tools/piwigo_remote.pl

@@ -11 +11 @@
 GetOptions(
     \%opt,
-    qw/action=s file=s thumbnail=s category_id=i name=s rank=i/
+    qw/action=s file=s thumbnail=s category_id=i name=s rank=s/
 );
 
@@ -62 +62 @@
         category_id => $opt{category_id},
         name => $opt{name},
-        rank => defined($opt{rank}) ? $opt{rank} : 1,
+        rank => defined($opt{rank}) ? $opt{rank} : 'auto',
     };