Change updatev RRA return from index_number to cf_nam, pdp_cnt.

Also revert accidental addition of -I to aclocal MakeMakefile.

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@203 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/MakeMakefile b/MakeMakefile
index 8b311faa59cfb511e4fb154de4e6c667a9132b73..28c62ed9b30f83e28411294d156bffa7b70b272d 100755 (executable)
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -47,7 +47,7 @@ cp ltmain.sh config
 # If autoconf generates undefined MACRO errors, it may be unable
 # to find libtool.m4. Add the -I flag to aclocal to specify the
 # directory location of this file.
-aclocal -I $HOME/libtool/share/aclocal
+aclocal
 autoheader --warnings=all
 automake-1.7 --foreign --add-missing --force-missing --copy 
 

diff --git a/doc/rrdupdate.pod b/doc/rrdupdate.pod
index 394c49cb2e283bc072a1773858e6896f9789fc96..d10846f99a42162d6f690b753ec3c079dd7c1cb2 100644 (file)
--- a/doc/rrdupdate.pod
+++ b/doc/rrdupdate.pod
@@ -27,9 +27,9 @@ performs the same function. The I<v> stands for I<verbose>, which
 describes the output returned. B<updatev> returns a list of any and all
 consolidated data points (CDPs) written to disk as a result of the
 invocation of update. The values are indexed by timestamp (time_t),
-RRA (index number), and data source (name). Note that depending
-on the arguments of the current and previous call to update, the
-list may have no entries or a large number of entries.
+RRA (consolidation function and PDPs per CDP), and data source (name).
+Note that depending on the arguments of the current and previous call to
+update, the list may have no entries or a large number of entries.
 
 =item I<filename>
 

diff --git a/src/rrd_update.c b/src/rrd_update.c
index 9e8063e35733388295d9223a8df704092a3eccaf..e9c75475b0ac2802a4964cac29df68d1442052ba 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -5,6 +5,10 @@
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.10  2003/04/29 19:14:12  jake
+ * Change updatev RRA return from index_number to cf_nam, pdp_cnt.
+ * Also revert accidental addition of -I to aclocal MakeMakefile.
+ *
  * Revision 1.9  2003/04/25 18:35:08  jake
  * Alternate update interface, updatev. Returns info about CDPs written to disk as result of update. Output format is similar to rrd_info, a hash of key-values.
  *
@@ -1441,8 +1445,9 @@ info_t
             iv.u_val = rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val;
             /* append info to the return hash */
                 pcdp_summary = info_push(pcdp_summary,
-                sprintf_alloc("[%d]RRA[%lu]DS[%s]",
-                *rra_time, rra_idx, rrd->ds_def[ds_idx].ds_nam),
+                sprintf_alloc("[%d]RRA[%s][%lu]DS[%s]",
+                *rra_time, rrd->rra_def[rra_idx].cf_nam, 
+                rrd->rra_def[rra_idx].pdp_cnt, rrd->ds_def[ds_idx].ds_nam),
          RD_I_VAL, iv);
          }
          if(fwrite(&(rrd -> cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),