Diff for /loncom/interface/lonsearchcat.pm between versions 1.50 and 1.55

version 1.50, 2001/03/21 02:09:38 version 1.55, 2001/03/21 02:34:35
Line 52  my %metadatafields; Line 52  my %metadatafields;
 my %cprtag;  my %cprtag;
 my %mimetag;  my %mimetag;
 my $closebutton;  my $closebutton;
 my $viewselect=<<END;  my $basicviewselect=<<END;
 <select name='view'>  <select name='basicviewselect'>
   <option value='Detailed Citation View'>Detailed Citation View</option>
   <option value='Summary View'>Summary View</option>
   <option value='Fielded Format'>Fielded Format</option>
   <option value='XML/SGML'>XML/SGML</option>
   </select>
   END
   my $advancedviewselect=<<END;
   <select name='advancedviewselect'>
 <option value='Detailed Citation View'>Detailed Citation View</option>  <option value='Detailed Citation View'>Detailed Citation View</option>
 <option value='Summary View'>Summary View</option>  <option value='Summary View'>Summary View</option>
 <option value='Fielded Format'>Fielded Format</option>  <option value='Fielded Format'>Fielded Format</option>
Line 262  ENDDOCUMENT Line 270  ENDDOCUMENT
 <input type="submit" name="basicsubmit" value="SEARCH">  <input type="submit" name="basicsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">  <input type="reset" name="reset" value="RESET">
 $closebutton  $closebutton
 $viewselect  $basicviewselect
 </p>  </p>
 <hr>  <hr>
 <h3>Advanced Search</h3>  <h3>Advanced Search</h3>
Line 271  $scrout Line 279  $scrout
 <input type="submit" name="advancedsubmit" value="SEARCH">  <input type="submit" name="advancedsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">  <input type="reset" name="reset" value="RESET">
 $closebutton  $closebutton
 $viewselect  $advancedviewselect
 </p>  </p>
 </form>  </form>
 </body>  </body>
Line 593  sub output_results { Line 601  sub output_results {
  $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;   $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
  $reply=~/(.*?)\_/;   $reply=~/(.*?)\_/;
  my $hostname=$1;   my $hostname=$1;
    sleep 3; # temporary fix, need to check for completion and status
  {   {
     while (1) {      while (1) {
  last if -e $replyfile;   last if -e $replyfile;
Line 615  sub output_results { Line 623  sub output_results {
  $creationdate,$lastrevisiondate,$owner,$copyright)=@fields;   $creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
     my $shortabstract=$abstract;      my $shortabstract=$abstract;
     $shortabstract=substr($abstract,0,200) if length($abstract)>200;      $shortabstract=substr($abstract,0,200) if length($abstract)>200;
       $fields[7]=$shortabstract;
     $compiledresult.=<<END;      $compiledresult.=<<END;
 <p>  <p>($title)
 END  END
             $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';              $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"  <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
Line 624  onClick="javascript:select_data('$title' Line 633  onClick="javascript:select_data('$title'
 </font>  </font>
 <br>  <br>
 END  END
                           my $httphost=$ENV{'HTTP_HOST'};
             if ($ENV{'form.viewselect'} eq 'Detailed Citation View') {  
  $compiledresult.=&detailed_citation_view(@fields);      my $viewselect;
       if ($mode eq 'Basic') {
    $viewselect=$ENV{'form.basicviewselect'};
       }
       elsif ($mode eq 'Advanced') {
    $viewselect=$ENV{'form.advancedviewselect'};
       }
   
               if ($viewselect eq 'Detailed Citation View') {
    $compiledresult.=&detailed_citation_view(@fields,
    $hostname,$httphost);
     }      }
             elsif ($ENV{'form.viewselect'} eq 'Summary View') {              elsif ($viewselect eq 'Summary View') {
  $compiledresult.=&summary_view(@fields);   $compiledresult.=&summary_view(@fields,$hostname,$httphost);
     }      }
             elsif ($ENV{'form.viewselect'} eq 'Fielded Format') {              elsif ($viewselect eq 'Fielded Format') {
  $compiledresult.=&fielded_format_view(@fields);   $compiledresult.=&fielded_format_view(@fields,$hostname,
         $httphost);
     }      }
             elsif ($ENV{'form.viewselect'} eq 'XML/SGML') {              elsif ($viewselect eq 'XML/SGML') {
  $compiledresult.=&xml_sgml_view(@fields);   $compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost);
     }      }
   
         }          }
Line 761  sub recursive_SQL_query_build { Line 781  sub recursive_SQL_query_build {
 # ------------------------------------------------------ Detailed Citation View  # ------------------------------------------------------ Detailed Citation View
 sub detailed_citation_view {  sub detailed_citation_view {
     my ($title,$author,$subject,$url,$keywords,$version,      my ($title,$author,$subject,$url,$keywords,$version,
  $notes,$abstract,$mime,$lang,   $notes,$shortabstract,$mime,$lang,
  $creationdate,$lastrevisiondate,$owner,$copyright)=@_;   $creationdate,$lastrevisiondate,$owner,$copyright,
    $hostname,$httphost)=@_;
       return 'abc';
     my $result=<<END;      my $result=<<END;
 <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>  DETAILED
   <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
 <br>  <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>
Line 787  END Line 810  END
 # ---------------------------------------------------------------- Summary View  # ---------------------------------------------------------------- Summary View
 sub summary_view {  sub summary_view {
     my ($title,$author,$subject,$url,$keywords,$version,      my ($title,$author,$subject,$url,$keywords,$version,
  $notes,$abstract,$mime,$lang,   $notes,$shortabstract,$mime,$lang,
  $creationdate,$lastrevisiondate,$owner,$copyright)=@_;   $creationdate,$lastrevisiondate,$owner,$copyright,
    $hostname,$httphost)=@_;
     my $result=<<END;      my $result=<<END;
 <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>  SUMMARY
   <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
 <br>  <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>
Line 813  END Line 838  END
 # -------------------------------------------------------------- Fielded Format  # -------------------------------------------------------------- Fielded Format
 sub fielded_format_view {  sub fielded_format_view {
     my ($title,$author,$subject,$url,$keywords,$version,      my ($title,$author,$subject,$url,$keywords,$version,
  $notes,$abstract,$mime,$lang,   $notes,$shortabstract,$mime,$lang,
  $creationdate,$lastrevisiondate,$owner,$copyright)=@_;   $creationdate,$lastrevisiondate,$owner,$copyright,
    $hostname,$httphost)=@_;
     my $result=<<END;      my $result=<<END;
 <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>  FIELDED
   <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
 <br>  <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>
Line 839  END Line 866  END
 # -------------------------------------------------------------------- XML/SGML  # -------------------------------------------------------------------- XML/SGML
 sub xml_sgml_view {  sub xml_sgml_view {
     my ($title,$author,$subject,$url,$keywords,$version,      my ($title,$author,$subject,$url,$keywords,$version,
  $notes,$abstract,$mime,$lang,   $notes,$shortabstract,$mime,$lang,
  $creationdate,$lastrevisiondate,$owner,$copyright)=@_;   $creationdate,$lastrevisiondate,$owner,$copyright,
    $hostname,$httphost)=@_;
     my $result=<<END;      my $result=<<END;
 <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>  XML/SGML
   <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
 <br>  <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>

Removed from v.1.50  
changed lines
  Added in v.1.55


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>