more new-graph fixes

webtools/new-graph/getdata.cgi

@@ -62,7 +62,7 @@ def doError(errCode):
 
 db = None
 
-def doListTests(fo, tbox):
+def doListTests(fo):
     results = []
     
     cur = db.cursor()
@@ -141,7 +141,7 @@ def main():
         zfile = gzip.GzipFile(mode = 'wb', fileobj = zbuf, compresslevel = 5)
 
     global db
-    db = sqlite.connect(dbfile)
+    db = sqlite.connect(DBPATH)
     
     if setid is None:
         doListTests(zfile)

webtools/new-graph/js/TinderboxData.js

@@ -35,9 +35,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const getdatacgi = "getdata-fake.cgi?";
+//const getdatacgi = "getdata-fake.cgi?";
 //const getdatacgi = "http://localhost:9050/getdata.cgi?";
-//const getdatacgi = "getdata.cgi?";
+const getdatacgi = "getdata.cgi?";
 
 
 function checkErrorReturn(obj) {

webtools/new-graph/js/graph.js

@@ -218,6 +218,13 @@ function onGraphLoadRemainder(baselineDataSet) {
             SmallPerfGraph.selectionStartTime &&
             SmallPerfGraph.selectionEndTime)
         {
+            if (SmallPerfGraph.selectionStartTime < gCurrentLoadRange[0] ||
+                SmallPerfGraph.selectionEndTime > gCurrentLoadRange[1])
+            {
+                SmallPerfGraph.selectionStartTime = Math.max (SmallPerfGraph.selectionStartTime, gCurrentLoadRange[0]);
+                SmallPerfGraph.selectionEndTime = Math.min (SmallPerfGraph.selectionEndTime, gCurrentLoadRange[1]);
+            }
+
             BigPerfGraph.setTimeRange (SmallPerfGraph.selectionStartTime, SmallPerfGraph.selectionEndTime);
             autoExpand = false;
         }
@@ -247,8 +254,11 @@ function onGraphLoadRemainder(baselineDataSet) {
                         g.addDataSet(ds);
                         if (avgds)
                             g.addDataSet(avgds);
-                        if (g == SmallPerfGraph || autoExpand)
-                            g.expandTimeRange(ds.firstTime, ds.lastTime);
+                        if (g == SmallPerfGraph || autoExpand) {
+                            g.expandTimeRange(Math.max(ds.firstTime, gCurrentLoadRange ? gCurrentLoadRange[0] : ds.firstTime),
+                                              Math.min(ds.lastTime, gCurrentLoadRange ? gCurrentLoadRange[1] : ds.lastTime));
+                        }
+
                         g.autoScale();
 
                         g.redraw();

webtools/new-graph/utils/import.py

@@ -12,9 +12,9 @@ if len(sys.argv) < 3 or len(sys.argv) > 4:
     sys.exit()
 
 (testname, tbox) = sys.argv[1:3]
-replace = false
+replace = False
 if len(sys.argv) == 4:
-    replace = true
+    replace = True
 
 DBPATH = "db/data.sqlite"
 db = sqlite.connect(DBPATH)