r1800 + introduce getExplicitTagsOnly() and buildTrailFromIds()

+ complete object tag saver

diff --git a/inc/functions.php b/inc/functions.php
index 300babe3ccb3a55ed4e1213d243f79a068a6dded..063c0f34325e6c9e9b788de779d12ef5261d7b35 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1360,7 +1360,7 @@ function serializeTags ($trail)
        return $ret;
 }
 
-// a helper for expandInheritance()
+// a helper for getTrailExpansion()
 function traceTrail ($tree, $trail)
 {
        // For each tag find its path from the root, then combine items
@@ -1419,6 +1419,34 @@ function getImplicitTags ($oldtags)
        return $ret;
 }
 
+// Minimize the trail: exclude all implicit tags and return the resulting trail.
+function getExplicitTagsOnly ($trail, $tree = NULL)
+{
+       if ($tree === NULL)
+               $tree = getTagTree();
+       $ret = array();
+       foreach ($tree as $taginfo)
+       {
+               if (isset ($taginfo['kids']))
+               {
+                       $harvest = getExplicitTagsOnly ($trail, $taginfo['kids']);
+                       if (count ($harvest) > 0)
+                       {
+                               $ret = array_merge ($ret, $harvest);
+                               continue;
+                       }
+               }
+               // This tag isn't implicit, test is for being explicit.
+               foreach ($trail as $testtag)
+                       if ($taginfo['id'] == $testtag['id'])
+                       {
+                               $ret[] = $testtag;
+                               break;
+                       }
+       }
+       return $ret;
+}
+
 function loadRackObjectAutoTags()
 {
        assertUIntArg ('object_id');
@@ -1446,4 +1474,15 @@ function getGlobalAutoTags()
        return $ret;
 }
 
+// Build a tag trail from supplied tag id list and return it.
+function buildTrailFromIds ($tagidlist)
+{
+       $taglist = getTagList();
+       $ret = array();
+       foreach ($tagidlist as $tag_id)
+               if (isset ($taglist[$tag_id]))
+                       $ret[] = $taglist[$tag_id];
+       return $ret;
+}
+
 ?>

diff --git a/inc/ophandlers.php b/inc/ophandlers.php
index e1a4a2bc3073647fb12c9d92f08a1596e6f3d707..4682e87045c28a0f07f140394e45b3a25e33f3f6 100644 (file)
--- a/inc/ophandlers.php
+++ b/inc/ophandlers.php
@@ -1241,16 +1241,22 @@ function saveObjectTags ()
        global $root, $pageno, $tabno, $explicit_tags, $implicit_tags;
        assertUIntArg ('object_id');
        $object_id = $_REQUEST['object_id'];
-       return "${root}?page=${pageno}&tab=${tabno}&object_id=${object_id}&message=" . urlencode ('This is a dummy message.');
-       // FIXME: build a trail from the submitted data, minimize it;
-       // then find and handle any differences between the result
-       // and current explicit tag set (or wipe existing records and
-       // store the whole new set instead).
-       $nchanges = 0;
-       foreach ($_REQUEST['taglist'] as $tag_id)
+       // Build a trail from the submitted data, minimize it,
+       // then wipe existing records and store the new set instead.
+       useDeleteBlade ('RackObjectTags', 'object_id', $object_id);
+       $newtrail = getExplicitTagsOnly (buildTrailFromIds ($_REQUEST['taglist']));
+       $n_succeeds = $n_errors = 0;
+       foreach ($newtrail as $taginfo)
        {
-//             if (tagOnTrail ($explicit
+               if (useInsertBlade ('RackObjectTags', array ('object_id' => $object_id, 'tag_id' => $taginfo['id'])))
+                       $n_succeeds++;
+               else
+                       $n_errors++;
        }
+       if ($n_errors)
+               return "${root}?page=${pageno}&tab=${tabno}&object_id=${object_id}&error=" . urlencode ("Replaced trail with ${n_succeeds} tags, but experienced ${n_errors} errors.");
+       else
+               return "${root}?page=${pageno}&tab=${tabno}&object_id=${object_id}&message=" . urlencode ("New trail is ${n_succeeds} tags long");
 }
 
 ?>