fix mistakes

[libre10/libre10.git] / pdfsearch.pl

diff --git a/pdfsearch.pl b/pdfsearch.pl
index 464b221..e9e0f9f 100755 (executable)
--- a/pdfsearch.pl
+++ b/pdfsearch.pl
@@ -8,6 +8,7 @@ use WebService::Solr::Query;
 use warnings;
 use Data::Dumper;
 use YAML::XS;
+
 #use DBI;
 #
 #      Libre10
@@ -21,21 +22,28 @@ else {
        $confpath = "/etc/libre10.conf";
 }
 $confdata = YAML::XS::LoadFile($confpath);
+
 #my $sqlpath ="/tmp/libre10.db";
 #$sqldbi = DBI->connect("dbi:SQLite.dbname=" . $sqlpath);
-my $q = new CGI;
-my $mode = "";
-my $search_text=$q->param("search_text");
-$mode = $q->param("mode");
-$width = $q->param("width");
+my $q           = new CGI;
+my $mode        = "";
+my $search_text = $q->param("search_text");
+$mode   = $q->param("mode");
+$width  = $q->param("width");
 $height = $q->param("height");
 my $url  = $confdata->{solrurl};
 my $solr = WebService::Solr->new($url);
 print $q->header( -type => "text/html", -charset => "utf-8" );
-print $q->start_html( -title => "rec10 pdf search", -lang => "ja-JP" );
+print $q->start_html(
+       -title  => "rec10 pdf search",
+       -lang   => "ja-JP",
+       -script => { -type => "text/javascript", -src => "frame.js" },
+       -style => { "src" => "libre10.css" }
+);
 print "<form action=\"pdfsearch.pl\" method=\"get\">";
 print "<div align=center><H1>Libre10 pdf search</H1></div>";
-print "<div align=center><p><input name='search_text' value='' style='width:200px'\/>";
+print
+"<div align=center><p><input name='search_text' value='' style='width:200px'\/>";
 print "<input type=\"submit\" value=\"search\"/></p></div><hr>";
 
 #print Dumper($confdata->{solrurl});
@@ -66,9 +74,9 @@ if ( length $search_text > 0 ) {
                }
        );
 
-       #my $response = $solr->search($query,{'rows' => '100','fl'=>'title,text,page,path'});
-       #my $response = $solr->search($query);
-       #print "texst";
+#my $response = $solr->search($query,{'rows' => '100','fl'=>'title,text,page,path'});
+#my $response = $solr->search($query);
+#print "texst";
        my $hits            = $response->content;
        my %hits            = %$hits;
        my $response_header = $hits{grouped}{title_group}{groups};
@@ -90,21 +98,27 @@ if ( length $search_text > 0 ) {
        }
 }
 else {
+
        #print "<a href=pdfsearch.pl?mode=$mode&width=1600>for Tablet</a><br>\n";
        print "<div align=center>";
-       print "<a href=pdfsearch.pl?mode=mobile&width=1024&height=1280>for narrow band</a><br>\n";
-       print "<a href=pdfsearch.pl?mode=mobile&width=1600&height=2560>for Tablet</a><br>\n";
+       print
+"<a href=pdfsearch.pl?mode=mobile&width=1024&height=1280>for narrow band</a><br>\n";
+       print
+"<a href=pdfsearch.pl?mode=mobile&width=1600&height=2560>for Tablet</a><br>\n";
 
-       #print "<a href=pdfsearch.pl?mode=$mode&width=540>SmartPhone(w540)</a><br>\n";
-       print "<a href=pdfsearch.pl?mode=mobile&width=1080&height=1920>for SmartPhone</a><br>\n";
-       print "<a href=pdfsearch.pl?mode=mobile&width=1600&height=2100>for Tablet retina</a><br>\n";
-       print "<a href=pdfsearch.pl?mode=mobile&width=1280&height=2400>for SmartPhone retina</a><br>\n";
+  #print "<a href=pdfsearch.pl?mode=$mode&width=540>SmartPhone(w540)</a><br>\n";
+       print
+"<a href=pdfsearch.pl?mode=mobile&width=1080&height=1920>for SmartPhone</a><br>\n";
+       print
+"<a href=pdfsearch.pl?mode=mobile&width=1600&height=2100>for Tablet retina</a><br>\n";
+       print
+"<a href=pdfsearch.pl?mode=mobile&width=1280&height=2400>for SmartPhone retina</a><br>\n";
        print "<a href=pdfsearch.pl?mode=''>for PC(default)</a><br>\n";
        print "</div>";
 }
-print "<input type='hidden' name='mode'   value=" . $mode   . " >\n";
+print "<input type='hidden' name='mode'   value=" . $mode . " >\n";
 print "<input type='hidden' name='height' value=" . $height . " >\n";
-print "<input type='hidden' name='width'  value=" . $width  . " >\n";
+print "<input type='hidden' name='width'  value=" . $width . " >\n";
 
 #print $url;
 #print Dumper($mode);
@@ -118,10 +132,12 @@ sub printGroupResults() {
        print "<p><h2>$title</h2>  -  $hitsnum 件の合致<br>";
        foreach $doc (@$hits) {
 
-               #print $doc->{text};
-               #$sqldbi->prepare("SELECT path FROM pdffile WHERE id=" . $doc->{$path_id});
-               ($pagenum,$path,$linkpath)=($doc->{page},$doc->{path_id},$doc->{path_id});
-               print "page " . $pagenum ."<br>";
+        #print $doc->{text};
+        #$sqldbi->prepare("SELECT path FROM pdffile WHERE id=" . $doc->{$path_id});
+               ( $pagenum, $path, $linkpath ) =
+                 ( $doc->{page}, $doc->{path_id}, $doc->{path_id} );
+               print "page " . $pagenum . "<br>";
+
                #print Dumper($hits_hl->{$doc->{id}}{text});
                print "　" . $hits_hl->{ $doc->{id} }{text}[0] . "<br>";
                print "<a href=\"htmlserver.pl?pdfpath=$path";
@@ -131,4 +147,5 @@ sub printGroupResults() {
                print "</p>\n";
        }
 }
+
 #$sqldbi.disconnect;