novabbs
/
rocksolid-light
2
0
Fork 1
Code Issues 16 Pull Requests Releases Wiki Activity

Combine each section db into one .db3

This commit is contained in:
Retro_Guy 2020-12-24 02:36:17 -07:00
parent 19143de4d7
commit 136c984fa9
6 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rocksolid_Light/rocksolid/overboard.php
View File

@ -93,7 +93,7 @@ if(is_file($cachefile)) {
ob_start();
# Iterate through groups
$database = $spooldir.'/'.$config_name.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
$query = $dbh->prepare('SELECT * FROM '.$table.' WHERE newsgroup=:findgroup AND date >= '.$oldest.' ORDER BY date DESC LIMIT '.$maxdisplay);

23
Rocksolid_Light/rocksolid/search.php
View File

@ -123,7 +123,7 @@ $results=0;
}
$searchterms = "%".$_POST['terms']."%";
# Prepare search database
$database = $spooldir.'/'.$config_name.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
$overview = array();
@ -145,9 +145,26 @@ $results=0;
}
$dbh = null;
foreach($overview as $overviewline) {
/* Find section for links */
$menulist = file($config_dir."menu.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
foreach($menulist as $menu) {
if($menu[0] == '#') {
continue;
}
$menuitem=explode(':', $menu);
$glfp=fopen($config_dir.$menuitem[0]."/groups.txt", 'r');
$section="";
while($gl=fgets($glfp)) {
$group_name = preg_split("/( |\t)/", $gl, 2);
if(stripos(trim($overviewline['newsgroup']), trim($group_name[0])) !== false) {
$section=$menuitem[0];
break 2;
}
}
}
# Generate link
$url = $thissite."/article-flat.php?id=".$overviewline['number']."&group="._rawurlencode($overviewline['newsgroup'])."#".$overviewline['number'];
$groupurl = $thissite."/thread.php?group="._rawurlencode($overviewline['newsgroup']);
$url = "../".$section."/article-flat.php?id=".$overviewline['number']."&group="._rawurlencode($overviewline['newsgroup'])."#".$overviewline['number'];
$groupurl = "../".$section."/thread.php?group="._rawurlencode($overviewline['newsgroup']);
$fromoutput = explode("<", html_entity_decode($overviewline['name']));
// Use local timezone if possible

2
Rocksolid_Light/rslight/scripts/expire.php
View File

@ -16,7 +16,7 @@
$webserver_group=$CONFIG['webserver_user'];
$logfile=$logdir.'/expire.log';
$database = $spooldir.'/'.$config_name.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
$query = $dbh->prepare('DELETE FROM '.$table.' WHERE newsgroup=:newsgroup AND number=:number');

2
Rocksolid_Light/rslight/scripts/nocem.php
View File

@ -98,7 +98,7 @@ function delete_message($messageid, $group) {
}
}
if($config_name) {
$database = $spooldir.'/'.$config_name.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
$query = $dbh->prepare('DELETE FROM '.$table.' WHERE msgid=:messageid');

2
Rocksolid_Light/rslight/scripts/rslight-lib.php
View File

@ -975,7 +975,7 @@ $date_i,$mid_i,$references_i,$bytes_i,$lines_i,$xref_i) {
// Overview
$overviewHandle = fopen($spooldir."/".$nntp_group."-overview", 'a');
# Prepare overview database
$database = $spooldir.'/'.$section.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
if(!$dbh) {

2
Rocksolid_Light/rslight/scripts/spoolnews.php
View File

@ -111,7 +111,7 @@ function get_articles($ns, $group) {
global $enable_rslight, $spooldir, $CONFIG, $maxarticles_per_run, $maxfirstrequest, $workpath, $path, $remote_groupfile, $local_groupfile, $local, $logdir, $config_name, $logfile;
# Prepare search database (this is only for testing atm)
$database = $spooldir.'/'.$config_name.'-overview.db3';
$database = $spooldir.'/articles-overview.db3';
$table = 'overview';
$dbh = rslight_db_open($database, $table);
$sql = 'INSERT INTO '.$table.'(newsgroup, number, msgid, date, name, subject) VALUES(?,?,?,?,?,?)';