Changeset 25366 for trunk/DataStoreServer/web/cgi/dsgetindex

Timestamp:

Sep 14, 2009, 9:10:07 AM (17 years ago)

Author:

bills

Message:

remove usage of dsfits.cgi it doesn't work though the proxy

File:

• trunk/DataStoreServer/web/cgi/dsgetindex (modified) (4 diffs)

trunk/DataStoreServer/web/cgi/dsgetindex

@@ -140 +140 @@
             # 'text/plain' format
             print header('text/plain', '404 ERROR');
-            #print header('text/plain', '200 OK');
+#           print header('text/plain', '410 GONE');
+#            print header('text/plain', '200 OK');
             print @$stderr_buf;
             print STDERR @$stderr_buf;
+#            exit 410;
         }
     }
@@ -172 +174 @@
 #
 
-sub print_free_space {
-    use Filesys::Df;
-        # get free space
-        my $ref = df($DS_ROOT);
-        printf '<p>Free space: %.2f G (%.1f%%)</p>',
-                $ref->{bfree}/(1024*1024),
-                100.0*$ref->{bfree}/$ref->{blocks};
-        print "\n";
-}
+#sub print_free_space {
+#    use Filesys::Df;
+#       # get free space
+#       my $ref = df($DS_ROOT);
+#       printf '<p>Free space: %.2f G (%.1f%%)</p>',
+#               $ref->{bfree}/(1024*1024),
+#               100.0*$ref->{bfree}/$ref->{blocks};
+#        print "\n";
+#}
 sub pprint_pre {
 
     print header('text/html', '200 OK');
-    print start_html('Data Store');
+    my $name;
+    # note $fileset is not so we look at the name of the index script to determine the level
+    if ($program eq "dsfsindex") {
+        $name = $fileset;
+    } elsif ($program eq "dsprodindex") {
+        $name = "$product";
+    } else {
+        $name = "";
+    }
+    print start_html("IPP Data Store $name");
 
 
@@ -208 +219 @@
     print p();
 
-    print_free_space();
+#    print_free_space();
     print end_html();
 }
@@ -241 +252 @@
             # if this is a file request, use a download cgi
             if ($wpath =~ /\.fits\s*$/) {
-                    $wpath = '/ds-cgi/dsfits.cgi?'.substr($wpath, 4); # strip' /ds/'
+                # This doesn't work through the proxy
+                # The /ds-cgi gets tried on alala
+                #    $wpath = '/ds-cgi/dsfits.cgi?'.substr($wpath, 4); # strip' /ds/'
             }
 
-        print a({-href=>$wpath}, $toks[0]);
+        print a({-href=>$wpath, -type=>'image/x-fits'}, $toks[0]);
     }