Move CDEF start pointers if start of cdef is a step ahead of the start

of the data -- Ashok Mandala <chakri063@yahoo.com>

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

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 04cdc5478e7fc6b68bb2c7649f89d40ca15ec7a4..166d5624ccaa60c7e20d400a4e302825e1717bb9 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -816,6 +816,17 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
                    } /* if OP_VARIABLE */
                } /* loop through all rpi */
 
+                /* move the data pointers to the correct period */
+                for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
+                    if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
+                        long ptr = im->gdes[gdi].rpnp[rpi].ptr;
+                        if(im->gdes[gdi].start > im->gdes[ptr].start) {
+                            im->gdes[gdi].rpnp[rpi].data += im->gdes[gdi].rpnp[rpi].ds_cnt;
+                        }
+                     }
+                }
+        
+
                if(steparray == NULL){
                    rrd_set_error("rpn expressions without DEF"
                                " or CDEF variables are not supported");