Changeset 4459 for branches

Timestamp:

Dec 9, 2009, 11:14:01 PM (15 years ago)

Author:

plg

Message:

feature 1316 added: we now have the ability to only fill the single value
properties that are currently empty in the database instead of automatically
replacing.

feature 1312: as a matter of consistency, I have changed the replace_mode
(that was only for multiple values properties) into multiple_value_mode +
single_value_mode.

Location:

branches/2.0

Files:

• include/ws_functions.inc.php (modified) (7 diffs)
• ws.php (modified) (1 diff)

branches/2.0/include/ws_functions.inc.php

@@ -1666 +1666 @@
   }
 
-  // name
-  // category_id
-  // file_content
-  // file_sum
-  // thumbnail_content
-  // thumbnail_sum
-
   $params['image_id'] = (int)$params['image_id'];
   if ($params['image_id'] <= 0)
@@ -1692 +1685 @@
 
   // database registration
-  $update = array(
-    'id' => $params['image_id'],
-    );
+  $update = array();
 
   $info_columns = array(
@@ -1704 +1695 @@
     );
 
-  $perform_update = false;
   foreach ($info_columns as $key)
   {
     if (isset($params[$key]))
     {
-      $perform_update = true;
-      $update[$key] = $params[$key];
-    }
-  }
-
-  if ($perform_update)
-  {
+      if ('fill_if_empty' == $params['single_value_mode'])
+      {
+        if (empty($image_row[$key]))
+        {
+          $update[$key] = $params[$key];
+        }
+      }
+      elseif ('replace' == $params['single_value_mode'])
+      {
+        $update[$key] = $params[$key];
+      }
+      else
+      {
+        new PwgError(
+          500,
+          '[ws_images_setInfo]'
+          .' invalid parameter single_value_mode "'.$params['single_value_mode'].'"'
+          .', possible values are {fill_if_empty, replace}.'
+          );
+        exit();
+      }
+    }
+  }
+
+  if (count(array_keys($update)) > 0)
+  {
+    $update['id'] = $params['image_id'];
+
     include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     mass_updates(
@@ -1732 +1743 @@
       $params['image_id'],
       $params['categories'],
-      $params['replace_mode']
+      ('replace' == $params['multiple_value_mode'] ? true : false)
       );
   }
@@ -1743 +1754 @@
     $tag_ids = explode(',', $params['tag_ids']);
 
-    if ($params['replace_mode'])
+    if ('replace' == $params['multiple_value_mode'])
     {
       set_tags(
@@ -1750 +1761 @@
         );
     }
-    else
+    elseif ('append' == $params['multiple_value_mode'])
     {
       add_tags(
@@ -1756 +1767 @@
         array($params['image_id'])
         );
+    }
+    else
+    {
+      new PwgError(
+        500,
+        '[ws_images_setInfo]'
+        .' invalid parameter multiple_value_mode "'.$params['multiple_value_mode'].'"'
+        .', possible values are {replace, append}.'
+        );
+      exit();
     }
   }

branches/2.0/ws.php

@@ -290 +290 @@
         'maxValue' => $conf['available_permission_levels']
         ),
-      'replace_mode' => array('default' => false),
+      'single_value_mode' => array('default' => 'fill_if_empty'),
+      'multiple_value_mode' => array('default' => 'append'),
       ),
     'POST method only. Admin only
-<br/><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'
+<br/><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.
+<br/><b>single_value_mode</b> can be "fill_if_empty" (only use the input value if the corresponding values is currently empty) or "replace" (overwrite any existing value) and applies to single values properties like name/author/date_creation/comment
+<br/><b>multiple_value_mode</b> can be "append" (no change on existing values, add the new values) or "replace" and applies to multiple values properties like tag_ids/categories'
     );