summaryrefslogtreecommitdiffstats
path: root/abs/core/supplemental-web/contents
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2012-01-14 20:46:12 (GMT)
committerCecil <knoppmyth@gmail.com>2012-01-14 20:46:12 (GMT)
commitc321283760591e3c6e5d9ed415e9c422fee83d9e (patch)
tree4e482fdf514f477c7ac23e0da81ec82a51a53b39 /abs/core/supplemental-web/contents
parente9948fef7a06dbb6b0c53e50df10c0a0dc2d941b (diff)
parentd5525acd5a4054460b98930b46d9de5690c1fd36 (diff)
downloadlinhes_pkgbuild-c321283760591e3c6e5d9ed415e9c422fee83d9e.zip
linhes_pkgbuild-c321283760591e3c6e5d9ed415e9c422fee83d9e.tar.gz
linhes_pkgbuild-c321283760591e3c6e5d9ed415e9c422fee83d9e.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/supplemental-web/contents')
-rw-r--r--abs/core/supplemental-web/contents/count.py11
-rw-r--r--abs/core/supplemental-web/contents/docs.html4
-rw-r--r--abs/core/supplemental-web/contents/error/hobbit.html4
-rw-r--r--abs/core/supplemental-web/contents/error/phpadmin.html2
-rw-r--r--abs/core/supplemental-web/contents/header.jpg.mvbin88341 -> 0 bytes
-rw-r--r--abs/core/supplemental-web/contents/process.py40
6 files changed, 25 insertions, 36 deletions
diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py
index 6d813c1..d59144a 100644
--- a/abs/core/supplemental-web/contents/count.py
+++ b/abs/core/supplemental-web/contents/count.py
@@ -14,7 +14,7 @@ def main(argv):
# create a cursor
cursor = db.cursor()
# execute SQL statement
- cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM oldrecorded ORDER by starttime;")
+ cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM oldrecorded where oldrecorded.recstatus = -3 ORDER by starttime;")
result = cursor.fetchall()
for row in result:
@@ -58,7 +58,7 @@ def main(argv):
print '<div id="content"> <p></p>'
print '<table class="sample">'
print "Top 20 Shows"
- cursor.execute("select title,count(title),category as numtitle from oldrecorded group by title having (COUNT(title) > 1) order by (COUNT(title)) DESC limit 20;" )
+ cursor.execute("select title,count(title),category as numtitle from oldrecorded where oldrecorded.recstatus = -3 group by title having (COUNT(title) > 0 ) order by (COUNT(title)) DESC limit 20;" )
result = cursor.fetchall()
for row in result:
print " <tr>"
@@ -74,11 +74,14 @@ def main(argv):
print '<div id="column"></div>'
print '<table class="sample">'
print "Top 20 Categories"
- cursor.execute("select category,count(category) as numtitle from oldrecorded group by category having (COUNT(category) > 1) order by (COUNT(category)) DESC limit 20; " )
+ cursor.execute("select category,count(category) as numtitle from oldrecorded where oldrecorded.recstatus = -3 group by category having (COUNT(category) > 0 ) order by (COUNT(category)) DESC limit 20; " )
result = cursor.fetchall()
for row in result:
+ category = row[0]
+ if category == "":
+ category = "Unknown"
print " <tr>"
- print " <td>",row[0],"</td>"
+ print " <td>",category,"</td>"
print " <td>",row[1],"</td>"
print " </tr>"
#print "%16s %16s" %(row[0],row[1])
diff --git a/abs/core/supplemental-web/contents/docs.html b/abs/core/supplemental-web/contents/docs.html
index c4a934b..4a5e64a 100644
--- a/abs/core/supplemental-web/contents/docs.html
+++ b/abs/core/supplemental-web/contents/docs.html
@@ -35,10 +35,6 @@ Starting and stopping services.
<br>
<ul id="navlist">
<li>The root password is blank. You will not be able to remotely access this account until the password is set.</li>
- <li>The mythtv account is locked, reset the password if you wish login with this account.</li>
- <li>The mythtv account has full sudo privileges. </li>
- <li>All access from public ip address are blocked. Edit /etc/hosts.deny /etc/hosts.allow to change this.</li>
- <li>Mythfilldatabase will automaticlly run when mythbackend is started. If the last attempt was successful then it will skip this step and mythfilldatabase will run normally.</li>
<li>To keep a host from showing up in the network map, add it to:
/data/srv/hobbit/server/ext/ignoreclient.py
</li>
diff --git a/abs/core/supplemental-web/contents/error/hobbit.html b/abs/core/supplemental-web/contents/error/hobbit.html
index 18450f2..4c65716 100644
--- a/abs/core/supplemental-web/contents/error/hobbit.html
+++ b/abs/core/supplemental-web/contents/error/hobbit.html
@@ -4,8 +4,8 @@
</head>
<body>
-Hobbit does not appear to be installed.
+Xymon does not appear to be installed.
</br>
-Please visit the MythVantage advanced screen to enable Hobbit.
+If Xymon was just installed/started it will take a few minutes before this page populates.
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/error/phpadmin.html b/abs/core/supplemental-web/contents/error/phpadmin.html
index dbdd4d3..39b2f48 100644
--- a/abs/core/supplemental-web/contents/error/phpadmin.html
+++ b/abs/core/supplemental-web/contents/error/phpadmin.html
@@ -16,8 +16,6 @@ pacman -S phpmyadmin
</br>
PHP must be enabled for phpMyAdmin.
</br>
-The easiest way to enable php is to enable Mythweb under the advanced settings for MythVantage.
-</br>
</br>
</br>
diff --git a/abs/core/supplemental-web/contents/header.jpg.mv b/abs/core/supplemental-web/contents/header.jpg.mv
deleted file mode 100644
index 3bf128e..0000000
--- a/abs/core/supplemental-web/contents/header.jpg.mv
+++ /dev/null
Binary files differ
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index 93d16d9..9098ad6 100644
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -99,11 +99,11 @@ def isblank(indict):
def go_backup(myhost):
myhostname = socket.gethostname()
results="Nothing happened"
- if myhostname.strip() == myhost.strip():
- command= "sudo /usr/MythVantage/bin/backup_job"
- command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
- results=os.popen(command,'r')
- os.popen(command2,'r')
+ command= "sudo /usr/LH/bin/lh_system_backup_job"
+ print command
+ command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
+ results=os.popen(command,'r')
+ os.popen(command2,'r')
return results
@@ -122,28 +122,20 @@ def go_restore(restorefile,myhost):
return results
def go_optimize(myhost):
- myhostname = socket.gethostname()
- if myhostname.strip() == myhost.strip():
- command="/usr/LH/bin/optimize_mythdb.py"
- results=os.popen(command,'r')
- else:
- results='This host does not run a database'
+ #myhostname = socket.gethostname()
+ #if myhostname.strip() == myhost.strip():
+ command="/usr/LH/bin/optimize_mythdb.py"
+ print command
+ results=os.popen(command,'r')
+ #else:
+ #results='This host does not run a database'
return results
def go_update(myhost,update_type):
- myhostname = socket.gethostname()
- if myhostname.strip() == myhost.strip():
- cmd="sudo /usr/bin/update_system "
- command=cmd + update_type
-
- else:
- cmd=" call pacman update_system "
- cmd+=update_type
- command="/usr/bin/func \"" + myhost.strip() + "*\" " + cmd
- print command
-
- #print command
-
+ cmd=" call pacman update_system "
+ cmd+=update_type
+ command="/usr/bin/func \"" + myhost.strip() + "*\" " + cmd
+ print command
results=os.popen(command,'r')
return results
generated by cgit v0.12 at 2024-06-02 04:17:38 (GMT)