my $dsn = $Conf{SearchDSN};
my $db_user = $Conf{SearchUser} || '';
-my $hest_index_path = $Conf{HyperEstraierIndex};
+my $hest_node_url = $Conf{HyperEstraierIndex};
my $dbh;
return unless $use_hest;
- use HyperEstraier;
- my ($index_path, $index_node_url);
+ use Search::Estraier 0.04;
+ die "direct access to Hyper Estraier datatase is no longer supported. Please use estmaster\n"
+ unless ($use_hest =~ m#^http://#);
- if ($use_hest =~ m#^http://#) {
- $index_node_url = $use_hest;
- } else {
- $index_path = $TopDir . '/' . $use_hest;
- $index_path =~ s#//#/#g;
- }
- return ($index_path, $index_node_url);
+ return $use_hest;
}
sub getFilesHyperEstraier($) {
my $offset = $param->{'offset'} || 0;
$offset *= $on_page;
- die "no index_path?" unless ($hest_index_path);
-
- use HyperEstraier;
-
- my ($index_path, $index_node_url) = getHyperEstraier_url($hest_index_path);
+ die "no Hyper Estraier node URL?" unless ($hest_node_url);
# open the database
my $db;
- if ($index_path) {
- $db = HyperEstraier::Database->new();
- $db->open($index_path, $HyperEstraier::ESTDBREADER);
- } elsif ($index_node_url) {
- $db ||= HyperEstraier::Node->new($index_node_url);
+ if ($hest_node_url) {
+ $db ||= Search::Estraier::Node->new($hest_node_url);
$db->set_auth('admin', 'admin');
} else {
die "BUG: unimplemented";
}
# create a search condition object
- my $cond = HyperEstraier::Condition->new();
+ my $cond = Search::Estraier::Condition->new();
my $q = $param->{'search_filename'};
my $shareid = $param->{'search_share'};
$cond->add_attr("shareid NUMEQ $shareid") if ($shareid);
-# $cond->set_max( $offset + $on_page );
- $cond->set_options( $HyperEstraier::Condition::SURE );
+ $cond->set_max( $offset + $on_page );
+ $cond->set_options( 'SURE' );
$cond->set_order( getSort('search', 'est', $param->{'sort'} ) );
# get the result of search
my @res;
my ($result, $hits);
- if ($index_path) {
+ if ($hest_node_url) {
$result = $db->search($cond, 0);
- $hits = $result->size;
- } elsif ($index_node_url) {
- $result = $db->search($cond, 0);
- $hits = $result->doc_num;
+ if ($result) {
+ $hits = $result->hits;
+ } else {
+ $hits = 0;
+ }
} else {
die "BUG: unimplemented";
}
# for each document in result
for my $i ($offset .. ($offset + $on_page - 1)) {
- last if ($i >= $hits);
+ last if ($i >= $result->doc_num);
my $doc;
- if ($index_path) {
- my $id = $result->get($i);
- $doc = $db->get_doc($id, 0);
- } elsif ($index_node_url) {
+ if ($hest_node_url) {
$doc = $result->get_doc($i);
} else {
die "BUG: unimplemented";
INNER JOIN shares ON backups.shareID=shares.ID
INNER JOIN hosts ON backups.hostID = hosts.ID
LEFT OUTER JOIN archive_backup ON archive_backup.backup_id = backups.id
- WHERE backups.inc_size > 0 AND backups.inc_deleted is false AND archive_backup.backup_id IS NULL
+ WHERE backups.inc_size > 0 AND backups.size > 0 AND backups.inc_deleted is false AND archive_backup.backup_id IS NULL AND backups.parts > 0
GROUP BY
backups.hostID,
hosts.name,
$row->{size} = sprintf("%0.2f", $row->{size} / 1024 / 1024);
# do some cluster calculation (approximate)
- $row->{inc_size} = int(($row->{inc_size} + 1023 ) / ( 2 * 1024 ) * 2);
+ $row->{inc_size} = int(( ($row->{inc_size} + 1023 ) / 2 ) * 2);
$row->{inc_size_calc} ||= $row->{inc_size};
push @ret, $row;
}
debug('total size: ' + suma);
}
-function sumiraj(e) {
- var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
- var len = element_id('forma').elements.length;
- if (e) {
- var size = parseInt( element_id("fss" + e.name.substr(3)).value);
- if (e.checked) {
- suma += size;
+function update_size(name, checked, suma) {
+ var size = parseInt( element_id("fss" + name).value);
+
+ if (checked) {
+ suma += size;
+ } else {
+ suma -= size;
+ }
+
+ var volumes = parseInt( element_id("prt" + name).value);
+ debug('update_size('+name+','+checked+') suma: '+suma+' volumes: '+volumes);
+ if (volumes > 1) {
+ if (checked) {
+ element_id("volumes").innerHTML = "This will take "+volumes+" mediums!";
+ element_id("volumes").style.display = 'block';
+ suma = size;
+ update_sum(suma);
} else {
suma -= size;
+ element_id("volumes").style.display = 'none';
}
+ }
- var volumes = parseInt( element_id("prt" + e.name.substr(3)).value);
- if (volumes > 1) {
- if (e.checked) {
- element_id("volumes").innerHTML = "This will take "+volumes+" mediums!";
- element_id("volumes").style.display = 'block';
- suma = size;
- update_sum(suma);
- return suma;
- } else {
- suma -= size;
- element_id("volumes").style.display = 'none';
- }
- }
+ return suma;
+}
+function sumiraj(e) {
+ var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
+ var len = element_id('forma').elements.length;
+ if (e) {
+ suma = update_size(e.name.substr(3), e.checked, suma);
if (suma < 0) suma = 0;
} else {
suma = 0;
for (var i = 0; i < len; i++) {
- var e = element_id('forma').elements[i];
- if (e.name != 'all' && e.checked && e.name.substr(0,3) == 'fcb') {
- var el = element_id("fss" + e.name.substr(3));
- if (el && el.value) suma += parseInt(el.value) || 0;
+ var fel = element_id('forma').elements[i];
+ if (fel.name != 'all' && fel.checked && fel.name.substr(0,3) == 'fcb') {
+ suma = update_size(fel.name.substr(3), fel.checked, suma);
}
}
}
'<td align="center">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
'<td align="center">' . $backup->{'age'} . '</td>' .
'<td align="right">' . $backup->{'size'} . '</td>' .
- '<td align="right">' . $backup->{'inc_size'} .
+ '<td align="right">' . sprintf("%0.1f", $backup->{'inc_size'} / 1024 ) .
'<input type="hidden" id="fss'.$checkbox_key .'" value="'. $backup->{'inc_size_calc'} .'"></td>' .
'<input type="hidden" id="prt'.$checkbox_key .'" value="'. $backup->{'volumes'} .'"></td>' .
'<td align="left">' . ( qq{<img src="$img_url/icon-cd.gif" alt="media">} x $backup->{volumes} ) . '</td>' .
projects / BackupPC.git / blobdiff