Changeset 32950

Timestamp:

2019-04-01T16:48:53+13:00 (5 years ago)

Author:

davidb

Message:

Some additional features added

File:

• other-projects/is-sheet-music-encore/trunk/dapiclient2.pl (modified) (3 diffs)

other-projects/is-sheet-music-encore/trunk/dapiclient2.pl

@@ -48 +48 @@
 use OAuth::Lite::AuthMethod;
 
+# read_file()
+# Derived from:
+#   https://stackoverflow.com/questions/953707/in-perl-how-can-i-read-an-entire-file-into-a-string
+sub read_file
+{
+    my ($file) = @_;
+ 
+    my $text = do {
+    local $/ = undef;
+    open my $fh, "<", $file
+        || die "could not open $file: $!";
+    <$fh>;
+    };
+
+    chomp($text);
+    return $text;
+}
+
+my $DEBUG=1;
+my $WEB_DISPLAY=0;
 
 my $access_key = 'OAUTH_CONSUMER_KEY';    # replace with your access_key
 my $secret_key = 'OAUTH_CONSUMER_SECRET'; # replace with your secret_key
 my $ip_address = 'MY_IP_ADDRESS';         # replace with the IP address of your workstation or server
+
+if (-f "my_access_key.txt") {
+    $access_key = read_file("my_access_key.txt");
+}
+
+if (-f "my_secret_key.txt") {
+    $secret_key = read_file("my_secret_key.txt");
+}
+
+if (-f "my_ip_address.txt") {
+    $ip_address = read_file("my_ip_address.txt");
+}
     
-my $request_url = 'https://babel.hathitrust.org/cgi/htd/volume/pageimage/mdp.39015000000128/1';
+my $base_request_url = "https://babel.hathitrust.org/cgi/htd/volume/pageimage/";
+
+#my $request_url = $base_request_url."mdp.39015000000128/1";
+my $request_url = $base_request_url."mdp.39015070661841/1";
+
     
 my $consumer = OAuth::Lite::Consumer->new
@@ -61 +97 @@
    auth_method     => OAuth::Lite::AuthMethod::URL_QUERY,
   );
+
+if ($DEBUG) {
+    my $params = $consumer->gen_auth_params('GET', $request_url);
+    print STDERR "(Info) Resolved URL for retrieval:\n";
+    print STDERR "$request_url?v=2&";
+    print STDERR "oauth_consumer_key=$params->{'oauth_consumer_key'}&";
+    print STDERR "oauth_timestamp=$params->{'oauth_timestamp'}&";
+    print STDERR "oauth_nonce=$params->{'oauth_nonce'}&";
+    print STDERR "oauth_signature_method=$params->{'oauth_signature_method'}&";
+    print STDERR "oauth_signature=$params->{'oauth_signature'}&";
+    print STDERR "oauth_version=$params->{'oauth_version'}\n";
+}
 
 my $response = $consumer->request
@@ -80 +128 @@
 }
 
-print CGI::header(
-                  Content_type => $content_type,
-                  Status => $response->status_line,
-                 );
+if ($WEB_DISPLAY) {
+    print CGI::header(
+                      Content_type => $content_type,
+                      Status => $response->status_line,
+                     );
 
-unless ($success) {
-    print "<p><b>Error: " . $response->content . "</b><br/>";
+    unless ($success) {
+        print "<p><b>Error: " . $response->content . "</b><br/>";
+    }
+    else {
+        print $response->content;
+    }
 }
 else {
     print $response->content;
 }
-
 exit $success;