Diff: tokyoMetro.cpp

Revision:

5:6105553963bb

Parent:

4:acfd6fbf9f9e

Child:

6:d4d781f31f70

--- a/tokyoMetro.cpp	Sun Jul 05 08:09:02 2015 +0000
+++ b/tokyoMetro.cpp	Fri Oct 23 05:51:49 2015 +0000
@@ -8,7 +8,7 @@
 #include "AlarmClock.h"
 #include "matchLine.h"
 
-#define ACCESS_TOKEN "/sd/TMetroToken.txt" // "6d60c19c9497e9b2f5b847d31ab70cccce76269bbaf461b5ebd90dd16e71003c"
+#define ACCESS_TOKEN "/sd/TMetroToken.txt" 
 
 #define API_URL      "https://api.tokyometroapp.jp:443/api/v2"
 
@@ -32,15 +32,16 @@
 static picojson::value trainStat ;
 
 static std::map<std::string, string> lineTbl ;
-void TMetro_initLine(void) {
+void TMetro_initLine(void)
+{
     lineTbl["odpt.Railway:TokyoMetro.Tozai"]      = "東京メトロ東西線　" ;
-    lineTbl["odpt.Railway:TokyoMetro.Marunouchi"] = "東京メトロ丸の内線" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Namboku"]    = "東京メトロ南北線　" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Hibiya"]     = "東京メトロ日比谷線" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Fukutoshin"] = "東京メトロ副都心線" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Hanzomon"]   = "東京メトロ半蔵門線" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Ginza"]      = "東京メトロ銀座線　" ; 
-    lineTbl["odpt.Railway:TokyoMetro.Yurakucho"]  = "東京メトロ有楽町線" ; 
+    lineTbl["odpt.Railway:TokyoMetro.Marunouchi"] = "東京メトロ丸の内線" ;
+    lineTbl["odpt.Railway:TokyoMetro.Namboku"]    = "東京メトロ南北線　" ;
+    lineTbl["odpt.Railway:TokyoMetro.Hibiya"]     = "東京メトロ日比谷線" ;
+    lineTbl["odpt.Railway:TokyoMetro.Fukutoshin"] = "東京メトロ副都心線" ;
+    lineTbl["odpt.Railway:TokyoMetro.Hanzomon"]   = "東京メトロ半蔵門線" ;
+    lineTbl["odpt.Railway:TokyoMetro.Ginza"]      = "東京メトロ銀座線　" ;
+    lineTbl["odpt.Railway:TokyoMetro.Yurakucho"]  = "東京メトロ有楽町線" ;
     lineTbl["odpt.Railway:TokyoMetro.Chiyoda"]    = "東京メトロ千代田線" ;
 }
 
@@ -49,7 +50,7 @@
 
 static void removeCRLF(char *str)
 {
-   for(int i = strlen(str)-1; i>0 ; i--) {
+    for(int i = strlen(str)-1; i>0 ; i--) {
         if((str[strlen(str)-1] == '\n') || (str[strlen(str)-1] == '\r'))
             str[strlen(str)-1] = '\0' ;
         else break ;
@@ -67,8 +68,9 @@
         }
         fgets(accessToken, sizeof(accessToken), fp) ;
         removeCRLF(accessToken) ;
+        fclose(fp) ;
+        TMetro_initLine() ;
     }
-    TMetro_initLine() ;
     return accessToken ;
 }