X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bibtex_to_paper;h=a6350eb98caedfecffcac5d9b248c5ac41760660;hb=56c8d8b286ae38e170ce915472f9aa86fabf9fee;hp=8de1f19c64b1329921cf5189dade92eefd0aa9a5;hpb=11002400952e5341adc9ded20caa016cbb599d1c;p=bin.git

diff --git a/bibtex_to_paper b/bibtex_to_paper
index 8de1f19..a6350eb 100755
--- a/bibtex_to_paper
+++ b/bibtex_to_paper
@@ -91,6 +91,7 @@ my %options = (debug           => 0,
                man             => 0,
                only_print      => 0,
                search_by_pmid  => 0,
+               search_by_file  => 0,
                use_git         => 1,
                'bibtex_cache'  => File::Spec->catfile(User->Home,'.bibtex_to_paper_cache'),
               );
@@ -103,6 +104,7 @@ GetOptions(\%options,
            'use_git|use-git!',
            'only_print|only-print!',
            'search_by_pmid|search-by-pmid!',
+           'search_by_file|search-by-file!',
            'clear_cache|clear-cache!',
            'papers_directory|papers-directory=s@',
            'debug|d+','help|h|?','man|m');
@@ -236,6 +238,8 @@ sub open_bibtex_key {
         my $entry;
         if ($options->{search_by_pmid}) {
             $entry = select_entry_from_pmid($dbh,$sth,$bibtex_key);
+        } elsif ($options->{search_by_file}) {
+            $entry = select_entry_from_file($dbh,$sth,$bibtex_key);
         } else {
             $entry = select_entry_from_bibtex_key($dbh,$sth,$bibtex_key);
         }
@@ -266,11 +270,11 @@ sub fork_exec {
 sub open_pdf {
     my ($file_name,$options,$has_xoj) = @_;
     print STDERR "opening $file_name\n" if $DEBUG;
-    if ($has_xoj) {
-        fork_exec('xournal',$file_name);
-    } else {
-        fork_exec('xournal',$file_name)
+    my $pdf_viewer = 'xournal';
+    if (exists $options->{pdfviewer} and defined $options->{pdfviewer}) {
+        $pdf_viewer = $options->{pdfviewer};
     }
+    fork_exec($pdf_viewer,$file_name);
 }
 
 sub open_browser{
@@ -333,6 +337,12 @@ sub select_entry_from_pmid{
     return select_one($dbh,$sth->{select_bibtex_by_pmid},$pmid);
 }
 
+sub select_entry_from_file{
+    my ($dbh,$sth,$filename) = @_;
+
+    return select_one($dbh,$sth->{select_bibtex_by_file_name_like},'%'.$filename.'%');
+}
+
 
 sub select_entry_from_bibtex_key{
     my ($dbh,$sth,$bibtex_key) = @_;
@@ -469,6 +479,9 @@ EOF
 SELECT * FROM papers WHERE file_name = ?;
 EOF
          select_papers_by_pmid => <<'EOF',
+SELECT * FROM papers JOIN bibtex ON papers.file_name = bibtex.file_name WHERE bibtex.pmid = ?;
+EOF
+         select_papers_by_name_like => <<'EOF',
 SELECT * FROM papers WHERE file_name LIKE ?;
 EOF
          select_papers_by_path => <<'EOF',
@@ -482,6 +495,9 @@ SELECT * FROM bibtex WHERE bibtex_key LIKE ?;
 EOF
          select_bibtex_by_file_name => <<'EOF',
 SELECT * FROM bibtex WHERE file_name = ?;
+EOF
+         select_bibtex_by_file_name_like => <<'EOF',
+SELECT * FROM bibtex WHERE file_name LIKE ?;
 EOF
          select_bibtex_by_pmid => <<'EOF',
 SELECT * FROM bibtex WHERE pmid = ?;