Changeset 9533

Show
Ignore:
Timestamp:
05/08/08 12:06:30 (1 week ago)
Author:
erickson
Message:

Merged revisions 9515,9520,9525,9527,9532 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9515 | dbs | 2008-05-06 15:59:06 -0400 (Tue, 06 May 2008) | 2 lines


After 1.2, domains element is no longer used

........

r9520 | miker | 2008-05-07 14:17:37 -0400 (Wed, 07 May 2008) | 1 line


do not record emtpy tcn valuesOpen-ILS/src/perlmods/OpenILS/Application/Cat.pm

........

r9525 | erickson | 2008-05-07 16:40:13 -0400 (Wed, 07 May 2008) | 1 line


added content handler no longer tries to pull from the cache when the plugin cannot return data for that type of call anyway. removed Amazon stub methods because they 1. should have returned explicit undef, but more importantly because having them around means extra calls to memcache

........

r9527 | erickson | 2008-05-07 16:46:49 -0400 (Wed, 07 May 2008) | 1 line


applying empty tcn check on marc overlay api call as well

........

r9532 | erickson | 2008-05-08 12:01:57 -0400 (Thu, 08 May 2008) | 1 line


dojo-ized CGI parser

........

Location:
branches/acq-experiment
Files:
5 modified
1 copied

Legend:

Unmodified
Added
Removed

  • branches/acq-experiment

    • Property svnmerge-integrated changed from /trunk:1-9513 to /trunk:1-9532

  • branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm

    r9385 r9533  
    218218            return $evt if $evt; 
    219219 
    220                 $rec->tcn_value($tcn); 
     220                $rec->tcn_value($tcn) if ($tcn); 
    221221                $rec->tcn_source($tsource); 
    222222 
    … …  
    293293        $record->source(bib_source_from_name($source)) if $source; 
    294294        $record->tcn_source($tcn_source); 
    295         $record->tcn_value($tcn); 
     295        $record->tcn_value($tcn) if ($tcn); 
    296296        $record->creator($e->requestor->id); 
    297297        $record->editor($e->requestor->id); 

  • branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/WWW/AddedContent.pm

    r8079 r9533  
    8787 
    8888    return Apache2::Const::NOT_FOUND unless $handler and $type and $format and $key; 
    89     return $res if defined($res = $AC->serve_from_cache($type, $format, $key)); 
    90     return Apache2::Const::NOT_FOUND unless $AC->lookups_enabled; 
    9189 
    9290    my $err; 
    … …  
    9593 
    9694    return Apache2::Const::NOT_FOUND unless $handler->can($method); 
     95    return $res if defined($res = $AC->serve_from_cache($type, $format, $key)); 
     96    return Apache2::Const::NOT_FOUND unless $AC->lookups_enabled; 
    9797 
    9898    try { 

  • branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/WWW/AddedContent/Amazon.pm

    r7750 r9533  
    4848# -------------------------------------------------------------------------- 
    4949 
    50 sub toc_html { 
    51     my( $self, $key ) = @_; 
    52 } 
    53  
    54 sub toc_xml { 
    55     my( $self, $key ) = @_; 
    56 } 
    57  
    58 sub toc_json { 
    59     my( $self, $key ) = @_; 
    60 } 
    61  
    62 # -------------------------------------------------------------------------- 
    63  
    64 sub anotes_html { 
    65     my( $self, $key ) = @_; 
    66 } 
    67  
    68 sub anotes_xml { 
    69     my( $self, $key ) = @_; 
    70 } 
    71  
    72 sub anotes_json { 
    73     my( $self, $key ) = @_; 
    74 } 
    75  
    76  
    77 # -------------------------------------------------------------------------- 
    78  
    79 sub excerpt_html { 
    80     my( $self, $key ) = @_; 
    81 } 
    82  
    83 sub excerpt_xml { 
    84     my( $self, $key ) = @_; 
    85 } 
    86  
    87 sub excerpt_json { 
    88     my( $self, $key ) = @_; 
    89 } 
    90  
    91 # -------------------------------------------------------------------------- 
    92  
    93 sub reviews_html { 
    94     my( $self, $key ) = @_; 
    95 } 
    96  
    97 # we have to aggregate the reviews 
    98 sub reviews_xml { 
    99     my( $self, $key ) = @_; 
    100 } 
    101  
    102  
    103 sub reviews_json { 
    104     my( $self, $key ) = @_; 
    105 } 
    106  
    107 # -------------------------------------------------------------------------- 
    108  
    10950sub send_img { 
    11051    my($self, $response) = @_; 

  • branches/acq-experiment/Open-ILS/src/support-scripts/settings-tester.pl

    r9385 r9533  
    7171my $j_password    = $conf->bootstrap->passwd; 
    7272my $j_port    = $conf->bootstrap->port; 
    73 my $j_domain    = $conf->bootstrap->domains->[0]; 
     73# We should check for a domains element to catch likely upgrade errors 
     74my $j_domain    = $conf->bootstrap->domain; 
    7475my $settings_config = $conf->bootstrap->settings_config; 
    7576my $logfile    = $conf->bootstrap->logfile;