From a48ba912eaebac1bd77e9f3bcce5e42944e039c8 Mon Sep 17 00:00:00 2001
From: Max <ikj1234i@yahoo.com>
Date: Sun, 29 Aug 2021 19:13:33 -0400
Subject: [PATCH] oplog update

---
 op25/gr-op25_repeater/apps/oplog/op25/__init__.py  |  6 +++++-
 .../apps/oplog/op25/templates/about.html           |  1 +
 .../apps/oplog/op25/templates/error.html           |  4 ++--
 .../apps/oplog/op25/templates/footer-links.html    |  5 +++--
 .../apps/oplog/op25/templates/logs.html            | 14 +++++++-------
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/op25/gr-op25_repeater/apps/oplog/op25/__init__.py b/op25/gr-op25_repeater/apps/oplog/op25/__init__.py
index 8827b6a..4c6b257 100644
--- a/op25/gr-op25_repeater/apps/oplog/op25/__init__.py
+++ b/op25/gr-op25_repeater/apps/oplog/op25/__init__.py
@@ -460,8 +460,10 @@ def purge():
     params['ekeys'] = sorted(oplog_map.keys())
     DataStore  = column_helper('data_store')
     destfile = ''
+    b = False
     if 'bu' in params.keys():
         if params['bu'] == 'true':
+            b = True
             t = strftime("%Y%m%d_%H%M%S")
             destfile = 'op25-backup-%s.db' % t
             src = app.config['SQLALCHEMY_DATABASE_URI'][10:]
@@ -487,7 +489,8 @@ def purge():
             recCount = recCount.count()
             dispQuery = delRec.compile(compile_kwargs={"literal_binds": True})
             if simulate == 'false':
-                copyfile(src, dst)
+                if b == True:
+                    copyfile(src, dst)
                 db.session.execute(delRec)
                 db.session.commit()
                 db.session.execute("VACUUM") # sqlite3 clean up -- reduces file size
@@ -554,6 +557,7 @@ def data():
     
     start_time = None if 'sdate' not in params.keys() else datetime.datetime.utcfromtimestamp(float(params['sdate']))
     end_time = None if 'edate' not in params.keys() else datetime.datetime.utcfromtimestamp(float(params['edate']))
+    print(params)
     sysid = None if 'sysid' not in params.keys() else int(params['sysid'])
     
     stime = int(params['sdate']) #used in the queries
diff --git a/op25/gr-op25_repeater/apps/oplog/op25/templates/about.html b/op25/gr-op25_repeater/apps/oplog/op25/templates/about.html
index 0cfdba9..88d0878 100644
--- a/op25/gr-op25_repeater/apps/oplog/op25/templates/about.html
+++ b/op25/gr-op25_repeater/apps/oplog/op25/templates/about.html
@@ -46,6 +46,7 @@
 				<p class="card-text">	
 				OP25 Logs (aka Oplog) is the OP25 sqlite3 logs database viewer.
 				</p>
+
 				<p class="card-text">
 				Copyright &copy;  2020, 2021 Max H. Parke KA1RBI<br>
 				Copyright &copy;  2020, 2021 Michael Rose
diff --git a/op25/gr-op25_repeater/apps/oplog/op25/templates/error.html b/op25/gr-op25_repeater/apps/oplog/op25/templates/error.html
index 47d42ae..257b985 100644
--- a/op25/gr-op25_repeater/apps/oplog/op25/templates/error.html
+++ b/op25/gr-op25_repeater/apps/oplog/op25/templates/error.html
@@ -80,7 +80,7 @@
 		  Source: {{ source }}
 		</div>
 		{% endif %}       
-      
+
      </div>
   </div>
         
@@ -188,4 +188,4 @@
 
 {% block extra_javascripts %}
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/op25/gr-op25_repeater/apps/oplog/op25/templates/footer-links.html b/op25/gr-op25_repeater/apps/oplog/op25/templates/footer-links.html
index c3d6a17..630c2af 100644
--- a/op25/gr-op25_repeater/apps/oplog/op25/templates/footer-links.html
+++ b/op25/gr-op25_repeater/apps/oplog/op25/templates/footer-links.html
@@ -6,11 +6,12 @@
     <a href="{{ url_for('editsys') }}">System Tags</a>&nbsp;&nbsp;&nbsp;
     <a href="{{ url_for('edit_tags') }}?cmd=tgid">Talkgroup Tags</a>&nbsp;&nbsp;&nbsp;
     <a href="{{ url_for('edit_tags') }}?cmd=unit">Unit Tags</a>&nbsp;&nbsp;&nbsp;
-    <a href="{{ url_for('purge') }}">Purge Database</a>&nbsp;&nbsp;&nbsp;
+    <a href="{{ url_for('purge') }}">Purge</a>&nbsp;&nbsp;&nbsp;
+    <a href="{{ url_for('switch_db') }}">Backup & Switch</a>&nbsp;&nbsp;&nbsp;    
     <a href="{{ url_for('about') }}">About</a>
     <br>
     Server time: {{ t_loc() }} <br>
-    07.23.2021
+    08.29.2021
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/op25/gr-op25_repeater/apps/oplog/op25/templates/logs.html b/op25/gr-op25_repeater/apps/oplog/op25/templates/logs.html
index c3152f2..d4caf65 100644
--- a/op25/gr-op25_repeater/apps/oplog/op25/templates/logs.html
+++ b/op25/gr-op25_repeater/apps/oplog/op25/templates/logs.html
@@ -128,16 +128,16 @@
      var ed = edate();
      var sysid = $('#systemSelect').val();
      
-     var filter_tgid = 	{%+ if params['tgid'] is defined %}
+     var filter_tgid = 	{% if params['tgid'] is defined %}
      					{{ params['tgid'] }};
-     					{%+ else %}
+     					{% else %}
      					0;
-     					{%+ endif %}
-     var filter_suid = 	{%+ if params['suid'] is defined %}
+     					{% endif %}
+     var filter_suid = 	{% if params['suid'] is defined %}
      					{{ params['suid'] }};
-     					{%+ else %}
+     					{% else %}
      					0;
-     					{%+ endif %}     					
+     					{% endif %}     					
      
      console.log('filter_tgid=' + filter_tgid);
      console.log(typeof filter_tgid);
@@ -186,7 +186,7 @@
 	   null,
 	   null,
 	   null,
-	   { render: function(data){ return data / 1000000; }},
+	   { render: function(data){ return data / 1000000; } },
 		 ],
 	   {% endif %}