Update scraper.py

danozgriff · Mar 7, 2017 · 9fa2200 · 9fa2200
1 parent f75a6e8
commit 9fa2200
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scraper.py b/scraper.py
@@ -870,9 +870,9 @@ def Notify(rundt):
       #ranklist = scraperwiki.sqlite.execute("select distinct A.tidm, B.FTSE, A.`3d`, A.`10d`, A.`30d`, A.`90d`, A.`180d`, A.`6mthProfit`, A.`6mthProfit_Rank`, A.StdDev, A.StdDev_Rank, A.SignalAccuracy, A.SignalAccuracy_Rank, A.Overall_Score, A.Overall_Rank from (select * from Company_Performance where StdDev_Rank <= 50 intersect select * from Company_Performance where SignalAccuracy_Rank <= 50) as A inner join company as B on A.tidm = B.tidm order by A.Overall_Rank")
       #ranklist = scraperwiki.sqlite.execute("select distinct A.tidm, B.FTSE, A.`3d`, A.`10d`, A.`30d`, A.`90d`, A.`180d`, A.`6mthProfit`, A.`6mthProfit_Rank`, A.StdDev, A.StdDev_Rank, A.SignalAccuracy, A.SignalAccuracy_Rank, A.Overall_Score, A.Overall_Rank, C.Signal, C.Date AS "Signal Date" from (select * from Company_Performance where StdDev_Rank <= 50 intersect select * from Company_Performance where SignalAccuracy_Rank <= 50) as A inner join company as B on A.tidm = B.tidm INNER JOIN Signal_History as C on A.tidm = C.tidm where c.date >= %s order by A.Overall_Rank" % (datetime.datetime.strptime(datetime.date.today() - datetime.timedelta(days=7), "%Y-%m-%d").date()))
       #ranklist = scraperwiki.sqlite.execute("select distinct A.tidm, B.FTSE, A.`3d`, A.`10d`, A.`30d`, A.`90d`, A.`180d`, A.`6mthProfit`, A.`6mthProfit_Rank`, A.StdDev, A.StdDev_Rank, A.SignalAccuracy, A.SignalAccuracy_Rank, A.Overall_Score, A.Overall_Rank, C.Signal, C.Date AS "Signal Date" from (select * from Company_Performance where StdDev_Rank <= 50 intersect select * from Company_Performance where SignalAccuracy_Rank <= 50) as A inner join company as B on A.tidm = B.tidm INNER JOIN Signal_History as C on B.tidm = C.tidm where c.date >= %s order by A.Overall_Rank" % (datetime.datetime.strptime(datetime.date.today() - datetime.timedelta(days=7), "%Y-%m-%d").date()))
-	  ranklist = scraperwiki.sqlite.execute("select distinct A.tidm, B.FTSE, A.`3d`, A.`10d`, A.`30d`, A.`90d`, A.`180d`, A.`6mthProfit`, A.`6mthProfit_Rank`, A.StdDev, A.StdDev_Rank, A.SignalAccuracy, A.SignalAccuracy_Rank, A.Overall_Score, A.Overall_Rank, C.Signal, C.Date AS "Signal Date" from (select * from Company_Performance where StdDev_Rank <= 50 intersect select * from Company_Performance where SignalAccuracy_Rank <= 50) as A inner join company as B on A.tidm = B.tidm INNER JOIN Signal_History as C on B.tidm = C.tidm where C.date >= %s order by A.Overall_Rank" % (datetime.datetime.strptime(rundt, "%Y-%m-%d")))
+      ranklist = scraperwiki.sqlite.execute("select distinct A.tidm, B.FTSE, A.`3d`, A.`10d`, A.`30d`, A.`90d`, A.`180d`, A.`6mthProfit`, A.`6mthProfit_Rank`, A.StdDev, A.StdDev_Rank, A.SignalAccuracy, A.SignalAccuracy_Rank, A.Overall_Score, A.Overall_Rank, C.Signal, C.Date AS 'Signal Date' from (select * from Company_Performance where StdDev_Rank <= 50 intersect select * from Company_Performance where SignalAccuracy_Rank <= 50) as A inner join company as B on A.tidm = B.tidm INNER JOIN Signal_History as C on B.tidm = C.tidm where C.date >= %s order by A.Overall_Rank" % (datetime.datetime.strptime(datetime.date.today() - datetime.timedelta(days=7), "%Y-%m-%d").date()))
 
-	  Performance_Out = Performance_Out + "  TIDM     3D    10D    30D    90D   180D   6MthProfit   Rank    Stddev   Rank    Sig Accuracy   Rank    Overall Score   Rank<br>"
+      Performance_Out = Performance_Out + "  TIDM     3D    10D    30D    90D   180D   6MthProfit   Rank    Stddev   Rank    Sig Accuracy   Rank    Overall Score   Rank<br>"
       Performance_Out = Performance_Out + "-----------------------------------------------------------------------------------------------------------------------------<br>"
 
       for x in ranklist["data"]: