Bug 2675 users public lists do not show on opac-detail.pl

[koha_fer] / opac / oai.pl

diff --git a/opac/oai.pl b/opac/oai.pl
index 73f352f..532c3b8 100755 (executable)
--- a/opac/oai.pl
+++ b/opac/oai.pl
@@ -30,7 +30,8 @@ use MARC::File::USMARC;
 
 sub new { # Get a MAR::Record as parameter and bless it as MARC::Record::KOHADC
        shift;
-       bless shift;
+       my $marc = shift;
+       bless $marc  if( ref( $marc ) );
 }
 
 sub subfield {
@@ -55,12 +56,22 @@ my @result = ();
 
         foreach my $kohafield ( @_ ) {
                 my ( $field, $subfield ) = ::GetMarcFromKohaField( $kohafield, '' );
+                next unless defined $field; # $kohafield not defined in framework
                 push( @result, $field < 10 ? $marc->field( $field )->as_string() : $marc->subfield( $field, $subfield ) );
         }
 #        @result>1 ? \@result : $result[0];
        \@result;
 }  
 
+sub XMLescape {
+my ($t) = shift;
+
+       foreach (@$t ) {
+               s/\&/\&amp;/g; s/</&lt;/g;
+       }
+       $t;
+} 
+
 sub Status {
   my $self = shift;
        undef;
@@ -68,17 +79,17 @@ sub Status {
 
 sub Title {
   my $self = shift;
-       $self->getfields('biblio.title');
+       &XMLescape( $self->getfields('biblio.title') );
 }
 
 sub Creator {
   my $self = shift;
-       $self->getfields('biblio.author');
+       &XMLescape( $self->getfields('biblio.author') );
 }
 
 sub Subject {
   my $self = shift;
-       $self->getfields('bibliosubject.subject');
+       &XMLescape( $self->getfields('bibliosubject.subject') );
 }
 
 sub DateStamp {
@@ -125,12 +136,12 @@ sub Language {
 
 sub Type {
   my $self = shift;
-       $self->getfields('biblioitems.itemtype');
+       &XMLescape( $self->getfields('biblioitems.itemtype') );
 }
 
 sub Publisher {
   my $self = shift;
-       $self->getfields('biblioitems.publishercode');
+       &XMLescape( $self->getfields('biblioitems.publishercode') );
 }
 
 sub Set {
@@ -285,8 +296,13 @@ sub Archive_GetRecord
 
    if( my $r = $sth->fetchrow_hashref() ) {
        my $marc = new MARC::Record::KOHADC( ::GetMarcBiblio( $identifier ) );
-       $marc->{'biblio.timestamp'} = $r->{'timestamp'};
-       return $marc ;
+       if( $marc ) {
+               $marc->{'biblio.timestamp'} = $r->{'timestamp'};
+               return $marc ;
+       }
+       else {
+               warn("Archive_GetRecord : no MARC record for " . C4::Context->preference("OAI-PMH:archiveID") . ":" . $identifier);
+       }
    }
 
    $self->AddError ('idDoesNotExist', 'The value of the identifier argument is unknown or illegal in this repository');
@@ -316,11 +332,15 @@ sub Archive_ListRecords
 
         ($metadataPrefix, $offset, $from, $until ) = &parseResumptionToken($from, $until, $metadataPrefix, $resumptionToken);
 
-warn( "Archive_ListRecords : $set, $from, $until, $metadataPrefix, $resumptionToken\n");
+#warn( "Archive_ListRecords : $set, $from, $until, $metadataPrefix, $resumptionToken\n");
        $sth->execute( $from,$until,$self->{'MaxCount'}?$self->{'MaxCount'}:100000, $offset );
 
        while( my $r = $sth->fetchrow_hashref() ) { 
                my $marc = new MARC::Record::KOHADC( ::GetMarcBiblio( $r->{'biblionumber'} ) );
+               unless( $marc ) { # somme time there is problems within koha, and we can't get valid marc record
+                       warn("Archive_ListRecords : no MARC record for " . C4::Context->preference("OAI-PMH:archiveID") .":" . $r->{'biblionumber'} );
+                       next;
+               }
                $marc->{'biblio.timestamp'} = $r->{'timestamp'};
                push( @allrows, $marc );
        }