Changeset 35202

Timestamp:

Feb 24, 2013, 4:28:39 PM (13 years ago)

Author:

eugene

Message:

adding entries for the photladder public release pages

Location:

branches/eam_branches/ipp-20130207/dvodist

Files:

• INSTALL (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• configure.tcsh (modified) (5 diffs)
• ippdata/index.mkd (modified) (1 diff)
• ippdata/photladder.20130107.subset (added)
• ippdata/photladder.20130107.subset/index.mkd (added)
• ippdata/photladder.20130107.subset/relphot-csv (added)
• ippdata/photladder.20130107.subset/relphot-csv/index.mkd (added)
• ippdata/photladder.20130107.subset/relphot-fits (added)
• ippdata/photladder.20130107.subset/relphot-fits/index.mkd (added)
• ippdata/photladder.20130107.subset/ubercal-csv (added)
• ippdata/photladder.20130107.subset/ubercal-csv/index.mkd (added)
• ippdata/photladder.20130107.subset/ubercal-fits (added)
• ippdata/photladder.20130107.subset/ubercal-fits/index.mkd (added)
• scripts/mkindex.sh (modified) (1 diff)
• scripts/mkindex.sizes.sh (added)
• src/generate (modified) (4 diffs)
• www-util/ipp.php (modified) (3 diffs)
• www-util/ippdata.menu.dat (modified) (1 diff)

branches/eam_branches/ipp-20130207/dvodist/INSTALL

@@ -7 +7 @@
 
 pikake test examples:
-psconfigure --htdocs /var/www/ --rootdir /ippdata
+psconfigure --htdocs /var/www/ --rootdir /ippdata --rootwww http://pikake.ifa.hawaii.edu/ippdata
 make ippdata
 
-psconfigure --htdocs /var/www/ --rootdir /dvodist
+psconfigure --htdocs /var/www/ --rootdir /dvodist --rootwww http://pikake.ifa.hawaii.edu/ippdata
 make dvodist

branches/eam_branches/ipp-20130207/dvodist/Makefile.in

@@ -4 +4 @@
         @echo "  (website) = dvodist or ippdata"
 
-GENERATE = src/generate
+GENERATE = src/generate --htdocs @HTDOCS@ --rootdir @ROOTDIR@ --rootwww @ROOTWWW@
 
 # we have 2 sites (or more?) controlled by this build directory
@@ -44 +44 @@
 $(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-csv/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-csv/index.php \
 $(TGT-IPPDATA)/test.php \
 $(TGT-IPPDATA)/docs.php \
@@ -73 +78 @@
         @if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
         rm -f $(TGT-UTIL)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
+        $(GENERATE) $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
 
 $(TGT-UTIL)/%: $(SRC-UTIL)/%
@@ -84 +89 @@
         @if [ ! -d $(@D) ]; then mkdir -p $(@D) || exit; fi
         rm -f $(TGT-DVODIST)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
+        $(GENERATE) $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
 
 # non-generated php code is copied directly
@@ -96 +101 @@
         @if [ ! -d $(@D) ]; then mkdir -p $(@D) || exit; fi
         rm -f $(TGT-IPPDATA)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
+        $(GENERATE) $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
 
 # non-generated php code is copied directly
@@ -127 +132 @@
 $(SRC-PROG)/mkdist.testcat.sh \
 $(SRC-PROG)/mkindex.sh
-

branches/eam_branches/ipp-20130207/dvodist/configure.tcsh

@@ -11 +11 @@
 set htdocs  = ""
 set rootdir = ""
+set rootwww = ""
 set dbhost  = ""
 set dbuser  = ""
@@ -61 +62 @@
    endif
    breaksw;
+  case --rootwww*
+   if ("$1" == "--rootwww") then
+     shift
+     set rootwww = $1
+   else
+     set rootwww = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
   case --dbhost*
    if ("$1" == "--dbhost") then
@@ -153 +162 @@
 echo "htdocs:  $htdocs"
 echo "rootdir: $rootdir"
+echo "rootwww: $rootwww"
 # echo "dbhost:  $dbhost"
 # echo "dbuser:  $dbuser"
@@ -161 +171 @@
 if ("$htdocs" == "") goto usage
 if ("$rootdir" == "") goto usage
+if ("$rootwww" == "") goto usage
 
 # unless we need a db interface, skip this
@@ -197 +208 @@
 cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
 cat tmp.1       | sed "s|@ROOTDIR@|$rootdir|" > tmp.2
-cat tmp.2       | sed "s|@BINDIR@|$bindir|" > Makefile
+cat tmp.2       | sed "s|@BINDIR@|$bindir|" > tmp.1
+cat tmp.1       | sed "s|@ROOTWWW@|$rootwww|" > Makefile
 rm -f tmp.1 tmp.2
+
+# convert mkindex.sizes.sh.in to mkindex.sizes.sh
+#cat scripts/mkindex.sizes.sh.in | sed "s|@HTDOCS@|$htdocs|" > scripts/mkindex.sizes.sh
+chmod +x scripts/mkindex.sizes.sh
 
 ## # convert raw/site.php.in to raw/site.php

branches/eam_branches/ipp-20130207/dvodist/ippdata/index.mkd

@@ -1 +1 @@
 <?php include "@HTDOCS@/www-util/ippdata.page.php"; ?>
 
-# PS1 Public Data Distribution
+# PS1 / IPP Public Data Distribution
 
-This is the PS1 public data distribution server.  
+Pan-STARRS 1 (PS1) is an astronomical observatory dedicated to
+surveying the sky in optical wavelengths.  The telescope is located at
+the summit of Haleakala on the Hawaiian island of Maui.  Data
+collected by the telescope are automatically processed by the PS1
+Image Processing Pipeline (IPP).
 
-Data is distributed in several forms
+The PS1 telescope has been in full survey operations since May 2010.
+In the intervening period, it is surveyed the 3/4 of the sky visible
+from Hawaii repeatedly in 5 bands.  This "3pi" survey gets the major
+portion of the telescope time (56%), with the remaining time going to
+a variety of deep survey fields and dedicated asteroid search time. 
 
-@ Data Product             : none                       : plain : title : Comment
-@ PS1 Photometry Ladder v0 : photladder.20120604.subset : dir   : dir1  : Photometry Ladder released 2012.06.07 (EAM UPDATE)
-@ Synthetic Photometry DVO : catdir.syn.test            : dir   : dir1  : Demonstration DVO Database
+One of the major goals of the 3pi survey is the construction of a
+high-quality photometric reference catalog covering the 3pi region
+(Dec > -30 deg).  
+
+This web site provides the public access to data products related to
+the PS1 surveys, with particular emphasis on the bulk photometry (and
+eventually astrometry) datasets.  
+
+@ Data Product                : none                       : plain : title : Comment
+@ PS1 Photladder, 12.01       : photladder.20130107.subset : dir   : dir1  : Photometric Reference Ladder, Release 12.01
+@ Synthetic Photometry DVO    : catdir.syn.test            : dir   : dir2  : Demonstration DVO Database
+
+Public release of transient events and asteroid discoveries are
+provided via the links below.
+
+* [Transient public server](http://ifa.transients.hawaii.edu)
+* [Moving objects](http://ifa.objects.hawaii.edu)
+

branches/eam_branches/ipp-20130207/dvodist/scripts/mkindex.sh

@@ -8 +8 @@
 set topdir = $argv[1]
 
-# this is weak: depends on root location
-ln -s /data/ippc17.0/www/dvodist/www-root/index.php $topdir/
+set file = `basename $topdir`
 
-set file = `basename $topdir`
-echo "$file : plain : title  : Title" > $topdir/index.txt
-echo "..             : dir   : dir2  : parent directory" >> $topdir/index.txt
+echo '<?php include "@HTDOCS@/www-util/dvodist.page.php"; ?>' >  $topdir/index.mkd
+
+echo "$file : plain : title  : Title" >> $topdir/index.mkd
+echo "..             : dir   : dir2  : parent directory" >> $topdir/index.mkd
 
 set N = 1
 foreach entry ($topdir/*)
   set file = `basename $entry`
-  if ("$file" == "index.php") continue
-  if ("$file" == "index.txt") continue
+  if ("$file" == "index.mkd") continue
 
   if (-d $entry) then
-    echo "$file : dir : dir$N : directory" >> $topdir/index.txt
+    echo "@ $file : dir : dir$N : directory" >> $topdir/index.mkd
   endif
 
   if (-f $entry) then
-    echo "$file : file : file$N : database file" >> $topdir/index.txt
+    echo "@ $file : file : file$N : database file" >> $topdir/index.mkd
   endif
 

branches/eam_branches/ipp-20130207/dvodist/src/generate

@@ -6 +6 @@
 set htdocs  = ""
 set rootdir  = ""
+set rootwww  = ""
 set args    = ""
 set VERBOSE = 0
@@ -25 +26 @@
    else
      set rootdir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --rootwww*
+   if ("$1" == "--rootwww") then
+     shift
+     set rootwww = $1
+   else
+     set rootwww = `echo $1 | tr = ' ' | awk '{print $2}'`
    endif
    breaksw;
@@ -47 +56 @@
   echo "htdocs : $htdocs"
   echo "rootdir: $rootdir"
+  echo "rootwww: $rootwww"
   echo "input  : $args[1]"
   echo "output : $args[2]"
@@ -53 +63 @@
 if ("$htdocs" == "") goto usage
 if ("$rootdir" == "") goto usage
+if ("$rootwww" == "") goto usage
 
-cat $args[1] | sed "s|@HTDOCS@|$htdocs|" | sed "s|@ROOTDIR@|$rootdir|" > $args[2]
+cat $args[1] | sed "s|@HTDOCS@|$htdocs|" | sed "s|@ROOTDIR@|$rootdir|" | sed "s|@ROOTWWW@|$rootwww|" > $args[2]
 exit 0
 

branches/eam_branches/ipp-20130207/dvodist/www-util/ipp.php

@@ -147 +147 @@
 
     if (count($line) == 4) {
-      echo "count = 4<br>\n";
       $name  = trim($line[0]);
       $type  = trim($line[1]);
@@ -155 +154 @@
     }
     if (count($line) == 5) {
-      echo "count = 5<br>\n";
       $name  = trim($line[0]);
       $link  = trim($line[1]);
@@ -216 +214 @@
       break;
     case 'dir':
-      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$name\">$name</a></td><td>$info</td></tr>\n";
+      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$link\">$name</a></td><td>$info</td></tr>\n";
       break;
     default:
-      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$name\">$name</a></td><td>$info</td></tr>\n";
+      echo "<tr class=\"$style\"><td><a class=\"$style\" href=\"$link\">$name</a></td><td>$info</td></tr>\n";
       break;
     } 

branches/eam_branches/ipp-20130207/dvodist/www-util/ippdata.menu.dat

@@ -8 +8 @@
 
 menutop   | menutop      | plain   |                         | 
-menutop   | menuselect   | link    | DVO Releases                 | /index.php
+menutop   | menuselect   | link    | PS1 Data Release             | /index.php
 menutop   | menuselect   | link    | Documentation                | /docs.php
 menutop   | menuselect   | link    | Help                         | /help.php