cleaned up Biblio some

made indicator seperator light grey instead of black

added log line to transport_session

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1830 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
index aee8c67..6b238b7 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
@@ -611,21 +611,11 @@ __PACKAGE__->register_method(
        api_name        => "open-ils.search.biblio.class.full.staff",
 );
 
-#__PACKAGE__->register_method(
-#      method  => "biblio_search_class",
-#      api_name        => "open-ils.search.biblio.class.unordered",
-#);
-
 __PACKAGE__->register_method(
        method  => "biblio_search_class",
        api_name        => "open-ils.search.biblio.class.staff",
 );
 
-#__PACKAGE__->register_method(
-#      method  => "biblio_search_class",
-#      api_name        => "open-ils.search.biblio.class.unordered.staff",
-#);
-
 sub biblio_search_class {
 
        my( $self, $client, $class, $string, 
@@ -634,9 +624,6 @@ sub biblio_search_class {
        warn "org: $org_id : depth: $org_type : limit: $limit :  offset: $offset\n";
 
 
-# new method:  metabib.<class>.new_search_fts.metarecord.<staff>
-
-
        $offset         = 0     unless (defined($offset) and $offset > 0);
        $limit          = 100 unless (defined($limit) and $limit > 0);
        $org_id         = "1" unless (defined($org_id)); # xxx
@@ -669,11 +656,8 @@ sub biblio_search_class {
                throw OpenSRF::EX::InvalidArg ("Not a valid search class: $class")
        }
 
-       my $method = "open-ils.storage.cachable.metabib.$class.search_fts.metarecord.atomic";
-
-#      if($self->api_name =~ /order/) {
-#              $method = "open-ils.storage.cachable.metabib.$class.search_fts.metarecord.unordered.atomic",
-#      }
+       #my $method = "open-ils.storage.cachable.metabib.$class.search_fts.metarecord.atomic";
+       my $method = "open-ils.storage.metabib.$class.search_fts.metarecord.atomic";
 
        if($self->api_name =~ /staff/) { 
                $method =~ s/atomic/staff\.atomic/og;
@@ -705,37 +689,24 @@ sub biblio_search_class {
        my $records = $request->gather(1);
        if(!$records) {return { ids => [] }};
 
-       warn "Search request complete " . time() . "\n";
-
-       my @all_ids;
+       #my @all_ids;
 
-       use Data::Dumper;
        warn "Received " . scalar(@$records) . " id's from class search\n";
+       use Data::Dumper;
+       warn Dumper $records;
 
-       # if we just get one, it won't be wrapped in an array
-
-       if(!ref($records->[0])) {
-               $records = [$records]; } 
-       for my $i (@$records) { 
-               if(defined($i)) {
-                       push @all_ids, $i; 
-               }
-       }
-
-       my @ids = @all_ids;
-       @ids = grep { defined($_->[0]) } @ids;
+#      for my $i (@$records) { if(defined($i)) { push @all_ids, $i; } }
+#      my @ids = @all_ids;
+#      @ids = grep { defined($_->[0]) } @ids;
 
        $session->finish();
        $session->disconnect();
 
        my $count = undef;
-       if($self->api_name =~ /full/) { 
-               if(ref($records) && $records->[0]) {
-                       $count = $records->[0]->[3];
-               }
-       }
+       if( $records->[0] && defined($records->[0]->[3])) { $count = $records->[0]->[3];}
 
-       return { ids => \@ids, count => $count };
+       # records has the form: [ mrid, rank, singleRecord / 0, hitCount ];
+       return { ids => $records, count => $count };
 
 }
 

diff --git a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
index 9270fbe..bcebe39 100644 (file)
--- a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
+++ b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl
@@ -62,7 +62,7 @@
                                <xsl:value-of select="@ind1"/>
                        </td>
 
-                       <td class='marc_tag_ind' style='border-left: 1px solid black; padding-left: 3px;'>
+                       <td class='marc_tag_ind' style='border-left: 1px solid #A0A0A0; padding-left: 3px;'>
                                <xsl:value-of select="@ind2"/>
                                <span style='color:#FFF'>.</span> 
                        </td>

diff --git a/OpenSRF/src/libtransport/transport_session.c b/OpenSRF/src/libtransport/transport_session.c
index 21dfea1..8d67ae1 100644 (file)
--- a/OpenSRF/src/libtransport/transport_session.c
+++ b/OpenSRF/src/libtransport/transport_session.c
@@ -400,7 +400,8 @@ void startElementHandler(
                ses->state_machine->in_message_error = 1;
                buffer_add( ses->message_error_type, get_xml_attr( atts, "type" ) );
                ses->message_error_code = atoi( get_xml_attr( atts, "code" ) );
-               warning_handler( "Received <error> message" );
+               warning_handler( "Received <error> message with type %s and code %s", 
+                       get_xml_attr( atts, "type"), get_xml_attr( atts, "code") );
                return;
        }