small fixes and improvements

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@119 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/Makefile b/Makefile
index d6c7547..09d5f57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,13 @@ profile: test
        createdb $(db)
        date > $(profile_file)
        echo "## NORMAL RUN" >> $(profile_file)
+       sudo rm -Rf /data/backuppc/data/casket || true
+       estcall raw -auth admin admin 'http://localhost:1978/master?action=nodedel&name=backuppc' || true
+       estcall raw -auth admin admin 'http://localhost:1978/master?action=nodeadd&name=backuppc&label=BackupPC%20search%20index'
        sudo -u backuppc /data/backuppc/bin/BackupPC_updatedb -c $(profile_opt) | tee -a $(profile_file)
        echo "## DProf RUN" >> $(profile_file)
+       sudo rm -Rf /data/backuppc/data/casket || true
+       estcall raw -auth admin admin 'http://localhost:1978/master?action=nodeadd&name=backuppc&label=BackupPC%20search%20index'
        sudo -u backuppc perl -d:DProf /data/backuppc/bin/BackupPC_updatedb -d $(profile_opt)
        dprofpp 2>&1 | tee -a $(profile_file)
        echo "## DBI_PROFILE RUN" >> $(profile_file)

diff --git a/bin/BackupPC_updatedb b/bin/BackupPC_updatedb
index 32300fe..f0e9573 100755 (executable)
--- a/bin/BackupPC_updatedb
+++ b/bin/BackupPC_updatedb
@@ -116,15 +116,15 @@ sub hest_update {
        my $offset = 0;
        my $added = 0;
 
-       print " opening index $use_hest";
+       print " opening index";
        if ($index_path) {
                $hest_db = HyperEstraier::Database->new();
                $hest_db->open($TopDir . $index_path, $HyperEstraier::Database::DBWRITER | $HyperEstraier::Database::DBCREAT);
-               print " directly";
+               print "$index_path directly";
        } elsif ($index_node_url) {
                $hest_node ||= HyperEstraier::Node->new($index_node_url);
                $hest_node->set_auth('admin', 'admin');
-               print " via node URL";
+               print "$index_node_url via node URL";
        } else {
                die "don't know how to use HyperEstraier Index $use_hest";
        }