Clean up a bit.
This commit is contained in:
		@@ -70,9 +70,8 @@ def main():
 | 
				
			|||||||
                try:
 | 
					                try:
 | 
				
			||||||
                    # Insert data
 | 
					                    # Insert data
 | 
				
			||||||
                    sql = "INSERT INTO frames ("+attrib_names+") VALUES ("+attrib_values+")"
 | 
					                    sql = "INSERT INTO frames ("+attrib_names+") VALUES ("+attrib_values+")"
 | 
				
			||||||
                    logging.debug(sql)
 | 
					 | 
				
			||||||
                    conn.execute(sql, list(a.values()))
 | 
					                    conn.execute(sql, list(a.values()))
 | 
				
			||||||
 | 
					                    logging.debug("Frames table updated")
 | 
				
			||||||
                    # TODO update stations table here
 | 
					                    # TODO update stations table here
 | 
				
			||||||
                    # Original intent was to include the id from the frames table,
 | 
					                    # Original intent was to include the id from the frames table,
 | 
				
			||||||
                    # but that would mean making another query.
 | 
					                    # but that would mean making another query.
 | 
				
			||||||
@@ -87,11 +86,9 @@ def main():
 | 
				
			|||||||
                    ON CONFLICT([from]) \
 | 
					                    ON CONFLICT([from]) \
 | 
				
			||||||
                    DO UPDATE SET count = count + 1,\
 | 
					                    DO UPDATE SET count = count + 1,\
 | 
				
			||||||
                                  last_heard_unix = excluded.last_heard_unix;"
 | 
					                                  last_heard_unix = excluded.last_heard_unix;"
 | 
				
			||||||
                    #print(query3)
 | 
					 | 
				
			||||||
                    logging.debug(query3)
 | 
					 | 
				
			||||||
                    # Insert/update data
 | 
					                    # Insert/update data
 | 
				
			||||||
                    conn.execute(query3)
 | 
					                    conn.execute(query3)
 | 
				
			||||||
 | 
					                    logging.debug("Station table updated")
 | 
				
			||||||
                    conn.commit()
 | 
					                    conn.commit()
 | 
				
			||||||
                    #except:
 | 
					                    #except:
 | 
				
			||||||
                     #   print("Stations table couldn't be updated.")
 | 
					                     #   print("Stations table couldn't be updated.")
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,10 @@
 | 
				
			|||||||
</head>
 | 
					</head>
 | 
				
			||||||
<body>
 | 
					<body>
 | 
				
			||||||
<h1>{{station_call}} Status</h1>
 | 
					<h1>{{station_call}} Status</h1>
 | 
				
			||||||
{{station_lat}}, {{station_lon}}
 | 
					Station location: {{station_lat}}, {{station_lon}}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2> About </h2>
 | 
				
			||||||
 | 
					This is a work in progress. See <a href="https://amiok.net/gitea/W1CDN/aprs_tool">https://amiok.net/gitea/W1CDN/aprs_tool</a> for usage.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<h2> Recent RF Packets </h2>
 | 
					<h2> Recent RF Packets </h2>
 | 
				
			||||||
   <table>
 | 
					   <table>
 | 
				
			||||||
@@ -57,7 +60,5 @@
 | 
				
			|||||||
   {% endfor %}
 | 
					   {% endfor %}
 | 
				
			||||||
</table>
 | 
					</table>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<h2> Help </h2>
 | 
					 | 
				
			||||||
This is a work in progress. See <a href="https://amiok.net/gitea/W1CDN/aprs_tool">https://amiok.net/gitea/W1CDN/aprs_tool</a> for usage.
 | 
					 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user