Changeset 17381 for trunk/DataStoreServer/web/cgi

Timestamp:

Apr 7, 2008, 3:59:25 PM (18 years ago)

Author:

bills

Message:

Allow the data store server to be installed without a full IPP installation.

Location:

trunk/DataStoreServer/web/cgi

Files:

• dodsfits (added)
• dsfits.cgi (modified) (1 diff)
• dsgetindex (modified) (7 diffs)
• dsindex.cgi (modified) (1 diff)
• dsshellconfig (added)
• dstxtindex.cgi (modified) (1 diff)

trunk/DataStoreServer/web/cgi/dsfits.cgi

@@ -1 @@
-#!/usr/bin/env perl
-
-use strict;
-use CGI ':standard';
-
-my $DS_DIR = '/var/www/html/ds/dsroot';
-#my $DS_DIR = '.';
-
-my $uri = $ENV{'REQUEST_URI'};
-
-$uri = $ARGV[0];
-print STDERR "uri is $uri\n";
-
-(my $left, my $param) = split(/\,/, $uri);
-
-print STDERR "left: $left param: $param\n";
-
-if ($left !~ /\.fits$/) {
-        print header( -status => '404 Not Found' );
-        exit;
-}
-
-my @path = split(/\//, $left);
-
-my $fn = @path[$#path];
-my $fpath = $DS_DIR.'/'.$left;
-
-
-
-print header(   -type => 'image/fits',
-                                -attachment => $fn,
-                                -content_length => -s $fpath,
-                        );
-
-
-open F, $DS_DIR.'/'.$left;
-
-binmode(F);
-binmode(STDOUT);
-
-print while (<F>);
-
-close F;
+#!/bin/bash
+. ./dsshellconfig
+./dodsfits $*

trunk/DataStoreServer/web/cgi/dsgetindex

@@ -5 +5 @@
 # The only required argument is the REQUEST_URI.
 # The number of elements in the URI tell us whether we are listing
-# the root, a product, or a fileset.
-#
-# if a second argument -html is provided, the output is in HTML
+# the data store root, a product, or a fileset.
+#
+# if a second argument -html is provided, the output is in HTML format
+# otherwise plain text is used
 #
 # The only thing specific to the ipp used here is the exit codes.
@@ -16 +17 @@
 use CGI ':standard';
 use IPC::Cmd 0.36 qw( can_run run );
-use PS::IPP::Config qw($PS_EXIT_SUCCESS
-                       $PS_EXIT_UNKNOWN_ERROR
-                       $PS_EXIT_SYS_ERROR
-                       $PS_EXIT_CONFIG_ERROR
-                       $PS_EXIT_PROG_ERROR
-                       $PS_EXIT_DATA_ERROR
-                       $PS_EXIT_TIMEOUT_ERROR
-                       metadataLookupStr
-                       metadataLookupBool
-                       caturi
-                       );
+
+my $PS_EXIT_CONFIG_ERROR = 3;
+my $PS_EXIT_DATA_ERROR = 5;
 
 my $uri = shift;
@@ -34 +27 @@
     exit ($PS_EXIT_CONFIG_ERROR);
 }
+
+my $DS_ROOT = $ENV{DS_ROOT};
+
+die("DS_ROOT not found in the environment") unless defined($DS_ROOT);
 
 my @path;
@@ -59 +56 @@
     # there is no file on the url
 
-    print STDERR "html mode\n";
+    # print STDERR "html mode\n";
 
     ($directories, $query_str) = split/\?/, $uri;
@@ -96 +93 @@
 
 if (@dirs) {
+    # XXX need to output an error page
     warn("unexpected extra directories: @dirs in uri: $uri");
     exit ($PS_EXIT_CONFIG_ERROR);
@@ -167 +165 @@
 # XXX:
 # quick hacky pretty printer
-# Stolen Eric's mock up
+# Stolen from Eric's Data Store mock up
 #
 
@@ -174 +172 @@
 
     print header('text/html', '200 OK');
-    print start_html('Datastore');
+    print start_html('Data Store');
 
         # get free space
-        # XXX: need to configure DS_DIR
-        my $DS_DIR = '/var/www/html/ds/dsroot';
-        my $ref = df($DS_DIR);
+        my $ref = df($DS_ROOT);
         printf '<p>Free space: %.2fG (%.1f%%)</p>',
                 $ref->{bfree}/(1024*1024),

trunk/DataStoreServer/web/cgi/dsindex.cgi

@@ -1 @@
-#!/bin/sh
-/export/data0/bills/psconfig/default.linrh64/bin/pstamp_runcommand.sh dsgetindex $REQUEST_URI -html
+#!/bin/bash
+. ./dsshellconfig
+dsgetindex $REQUEST_URI -html

trunk/DataStoreServer/web/cgi/dstxtindex.cgi

@@ -1 @@
-#!/bin/sh
-/export/data0/bills/psconfig/default.linrh64/bin/pstamp_runcommand.sh dsgetindex $REQUEST_URI;
+#!/bin/bash
+. ./dsshellconfig
+./dsgetindex $REQUEST_URI;