Changeset 38254

Timestamp:

May 8, 2015, 2:20:51 PM (11 years ago)

Author:

eugene

Message:

updates

Location:

branches/eam_branches/ipp-20150419/oofview

Files:

• cgi/dsgetindex.v1 (modified) (10 diffs)
• scripts/mkoof.sh (modified) (3 diffs)
• scripts/oof.sh (modified) (8 diffs)

branches/eam_branches/ipp-20150419/oofview/cgi/dsgetindex.v1

@@ -75 +75 @@
    $file    = shift @dirs;
 
+my $filelevel = "UNKNOWN";
+
 my $program;
 if ($file) {
     $program = "NONE";
+    $filelevel = "FILE";
 } elsif ($fileset) {
     $program = "dsfsindex";
+    $filelevel = "FILESET";
 } elsif ($product) {
     $program = "dsprodindex";
     $fileset = "";
+    $filelevel = "PRODUCT";
 } else {
     $program = "dsrootindex";
     $fileset = "";
     $product = "";
+    $filelevel = "ROOT";
 }
 
@@ -98 +104 @@
       print "PRODUCT: $product\n";
       print "FILE:    $filename\n";
+      print "FILELEVEL: $filelevel\n";
     }
 
@@ -104 +111 @@
     close (FILE);
 
-    print @list;
+    foreach my $line (@list) {
+        if ($line =~ m/OOF/) {
+            print $line;
+        }
+    }
+    # print @list;
 
     exit 0;
@@ -118 +130 @@
       print "PRODUCT: $product\n";
       print "FILE:    $filename\n";
+      print "FILELEVEL: $filelevel\n";
       print "run fhead\n";
     }
@@ -138 +151 @@
       print "PRODUCT: $product\n";
       print "FILE:    $filename\n";
+      print "FILELEVEL: $filelevel\n";
     }
 
@@ -218 +232 @@
         # return link
         if ($program ne "dsrootindex") {
-            print a({-href=>"./index.txt"}, "Text Version");
+            print a({-href=>"$script_name$path_info/index.txt"}, "Text Version");
         }
 
@@ -232 +246 @@
                     # no up link in dsroot
                 } else {
-                    print a({-href=>".."}, "Up to $script_name/$up");
+                    print a({-href=>"$script_name$up"}, "Up to $script_name$up");
                 }
             }
@@ -246 +260 @@
     print '</table>';
     print p();
+    print "<b>FILELEVEL: $filelevel</b>\n";
     print end_html();
 }
@@ -273 +288 @@
          # First column is link to an entity down one level in data store (product, fileset, file)
          # assumes id is always first field
-         my $wpath = "./$toks[0]";
+         my $wpath = "$script_name$path_info/$toks[0]";
 
          # if this is a file request, use a download cgi
@@ -303 +318 @@
                 $product =~ s/^\s+//;
                 $product =~ s/\s+$//;
-                print a({-href=>"./$product/$fileset"}, $fileset);
+                print a({-href=>"$script_name$product/$fileset"}, $fileset);
             }
         }

branches/eam_branches/ipp-20150419/oofview/scripts/mkoof.sh

@@ -1 +1 @@
 #!/bin/csh -f
+
+echo "starting mkoof.sh"
 
 if ($#argv != 1) then
@@ -7 +9 @@
   exit 2
 endif
+
+#echo "path: $1"
 
 # output list file
@@ -20 +24 @@
   set expname = `echo $nebfile | awk '{print substr($1,0,11)}'`
 
-  # echo "dskfile: $dskfile"
-    echo "nebfile: $nebfile"
-  # echo "newfile: $newfile"
-  # echo "expname: $expname"
+  #echo "dskfile: $dskfile"
+  echo "nebfile: $nebfile"
+  #echo "newfile: $newfile"
+  #echo "expname: $expname"
 
   mkdir -p $expname
 
-  if (! -e $expname/$newfile) ln -s $dskfile $expname/$newfile
+  # if (! -e $expname/$newfile) 
+  ln -sf $dskfile $expname/$newfile
+
   echo $newfile | awk '{n = substr($1,12,2)}{printf "%s|||ota%02d\n", $1, n}' >> $listfile
 end

branches/eam_branches/ipp-20150419/oofview/scripts/oof.sh

@@ -7 +7 @@
 
 $srcdir = /local/ipp/psconfig
-
-$test = 1
+$dsroot = /export/ippc20.0/ps2-oof/htdocs
+
+$test = 0
 
 if not($?Nrun)       set Nrun = 0
@@ -16 +17 @@
 if not($?runstate:n) set runstate:n = 0
 
+if not($?expset)      set expset:n = 0
+if not($?expsetstate) set expsetstate:n = 0
+
 if (not($?ppImageOpts))
   $ppImageOpts = 
@@ -21 +25 @@
   $ppImageOpts = $ppImageOpts -recipe PPIMAGE PPIMAGE_DET_ONLY
   $ppImageOpts = $ppImageOpts -F PPIMAGE.OUTPUT PPIMAGE.OUTPUT.NOCOMP
-  $ppImageOpts = $ppImageOpts -Db FLAT F
-  $ppImageOpts = $ppImageOpts -Db BASE.FITS T
   $ppImageOpts = $ppImageOpts -Db SQUASH.NANS T
   $ppImageOpts = $ppImageOpts -threads 4
@@ -41 +43 @@
   ippc39
   ippc40
+  ippc41
+  ippc42
+  ippc43
+  ippc44
+  ippc45
+  ippc46
+  ippc47
+  ippc48
+  ippc49
+  ippc50
+  ippc51
+  ippc52
+  ippc53
+  ippc54
+  ippc55
+  ippc56
+  ippc57
+  ippc58
+  ippc59
+end
+
+macro mknight
+  if ($0 != 2)
+    echo "USAGE: mknight (YYYYMMDD)"
+    break
+  end
+
+  local i expname datename idxname
+  $datename = $1
+  $idxname = $dsroot/gpc2/$datename.idx 
+
+  exec wget 'http://dsmaster.ps2/ds/gpc2/index.txt?$datename' -O $idxname
+  list lines -x "grep OOF $idxname"  
+  for i 0 $lines:n
+    substr "$lines:$i" 0 11 expname
+    mkcommands neb:///gpc2/$datename/$expname/$expname
+  end
+end
+
+macro done.night
+  if ($0 != 2)
+    echo "USAGE: done.night (YYYYMMDD)"
+    break
+  end
+
+  local i expname datename idxname
+  $datename = $1
+  $idxname = $dsroot/gpc2/$datename.idx 
+
+  list lines -x "grep OOF $idxname"  
+  for i 0 $lines:n
+    substr "$lines:$i" 0 11 expname
+    echo mkoof.sh neb:///gpc2/oof/$datename/$expname/$expname
+  end
 end
 
@@ -68 +124 @@
     if ($alldone)
       echo "$expset:$i is DONE"
+      $expsetstate:$i = done
     else
       echo "$expset:$i is not DONE"
@@ -83 +140 @@
   for i 0 $expset:n
     $name = $expset:$i
-    echo $expset:$i $name[]
+    echo $expset:$i $expsetstate:$i $name[]
   end
 end
@@ -112 +169 @@
 
   delete -q $expname
-  list expset -add $expname
+  list expset      -add $expname
+  list expsetstate -add run 
 
   list word -x "neb-ls -c $1%.fits"
@@ -168 +226 @@
   end
 end
-