Changeset 34498

Timestamp:

2020-10-20T11:17:11+13:00 (3 years ago)

Author:

kjdon

Message:

small mods to prevent warnings when calling start_yaz without a url (as happens in url_information)

File:

• main/trunk/greenstone2/perllib/downloaders/Z3950Download.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/downloaders/Z3950Download.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# WebDownload.pm -- base class for all the import plugins
+# Z3950Download.pm -- downloading class for z3950 protocol
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the 
@@ -142 +142 @@
 sub start_yaz 
 {
-    my ($self, $url) = @_;    
-
-    print STDERR "Opening connection to $url\n";
-     
+    my ($self, $url) = @_;
+    
     my $yaz = $self->{'yaz'};
     
@@ -154 +152 @@
     $self->{'YAZIN'} = *YAZIN;
 
-    my $strOpen = $self->open_connection("open $url");  
-
-    if (!$strOpen) {
-        print STDERR "Cannot connect to $url\n"; 
-        print STDERR "<<Finished>>\n";  
-    return 0;
-    }
-    return $strOpen;
+    if (defined $url) {
+        print STDERR "Opening connection to $url\n";
+    my $strOpen = $self->open_connection("open $url");  
+
+    if (!$strOpen) {
+        print STDERR "Cannot connect to $url\n"; 
+        print STDERR "<<Finished>>\n";  
+        return 0;
+    }
+    
+    return $strOpen;
+    }
+    return 1;
 }
 
@@ -389 +392 @@
    $url = $self->{'url'} unless defined $url;
 
-   my $strOpen = $self->start_yaz();
-
-   $strOpen = $self->run_command_with_output("open $url","^Options");  
+   #my $strOpen = $self->start_yaz();
+   $self->start_yaz();
+
+   my $strOpen = $self->run_command_with_output("open $url","^Options");  
 
    $strOpen =~ s/Z> //g;