Index: branches/eam_branches/ipp-20120905/dvodist/INSTALL =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/INSTALL (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/INSTALL (revision 34543) @@ -0,0 +1,11 @@ + +after setting up psconfig: + +kiawe / alala example: + psconfigure --dbhost alala --dbuser ipp --dbpass ipp --htdocs /var/www/kiawe + +# Regular installation on ippMonitor.ifa.hawaii.edu +# Note: we use a 'science databases (replication) slave' and the ippMonitor read-only account to connect to that database +psconfigure --dbhost scidbs1 --dbuser ippMonitor --dbpass ippMonitor --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config +psconfigure --htdocs /data/ippc17.0/www/dvodist/ +make php Index: branches/eam_branches/ipp-20120905/dvodist/Makefile.in =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/Makefile.in (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/Makefile.in (revision 34543) @@ -0,0 +1,88 @@ +default: +help: + @echo "USAGE: make php" + +# copy 'scripts' to target, copy 'www-util' to target, copy ' + +SRC-ROOT = www-root +SRC-UTIL = www-util +SRC-PROG = scripts + +TGT-ROOT = @HTDOCS@/www-root +TGT-UTIL = @HTDOCS@/www-util +TGT-PROG = @HTDOCS@/scripts + +PROG = \ +$(TGT-PROG)/mkdist.20120509.sh \ +$(TGT-PROG)/mkdist.20120525.sh \ +$(TGT-PROG)/mkdist.20120606.sh \ +$(TGT-PROG)/mkdist.testcat.sh \ +$(TGT-PROG)/mkindex.sh + +UTIL = \ +$(TGT-UTIL)/blank.html \ +$(TGT-UTIL)/ipp.menu.dat \ +$(TGT-UTIL)/ipp.php \ +$(TGT-UTIL)/markdown.php \ +$(TGT-UTIL)/phptest.php + +ROOT = \ +$(TGT-ROOT)/PScolorlogo2.jpg \ +$(TGT-ROOT)/docs.txt \ +$(TGT-ROOT)/help.txt \ +$(TGT-ROOT)/index.txt \ +$(TGT-ROOT)/index.php \ +$(TGT-ROOT)/ipp.css + +php: $(ROOT) $(UTIL) $(PROG) + +# dependancy rules for binary code ######################### +# .PRECIOUS: %.$(ARCH).o +# .PRECIOUS: $(BIN)/%.$(ARCH) + +# $(DESTLINK): $(DESTWWW)/Login.php +# rm -f $@ +# ln -s $(DESTWWW)/Login.php $@ +# +# $(DESTWWW)/version.php: +# svnversion > $@ + +# non-generated php code is copied directly +$(TGT-ROOT)/%: $(SRC-ROOT)/% + @if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi + cp $(SRC-ROOT)/$* $(TGT-ROOT)/$* || exit + chmod +x $(TGT-ROOT)/$* || exit + +$(TGT-PROG)/%: $(SRC-PROG)/% + @if [ ! -d $(TGT-PROG) ]; then mkdir -p $(TGT-PROG) || exit; fi + cp $(SRC-PROG)/$* $(TGT-PROG)/$* || exit + chmod +x $(TGT-PROG)/$* || exit + +$(TGT-UTIL)/%: $(SRC-UTIL)/% + @if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi + cp $(SRC-UTIL)/$* $(TGT-UTIL)/$* || exit + chmod +x $(TGT-UTIL)/$* || exit + +# $(TGT-ROOT)/%.css: $(TGT-SRC)/%.css +# @if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi +# rm -f $(TGT-ROOT)/$*.css || exit +# cp $(TGT-SRC)/$*.css $(TGT-ROOT)/$*.css || exit +# +# $(TGT-ROOT)/%.php: $(TGT-SRC)/%.php +# @if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi +# rm -f $(TGT-ROOT)/$*.php || exit +# cp $(TGT-SRC)/$*.php $(TGT-ROOT)/$*.php || exit + +# utilities ################################################# + +clean: + rm -f `find . -name "*.o"` + rm -f `find . -name "*~"` + rm -f `find . -name "#*"` + +.PRECIOUS: $(SRC)/%.php +.PRECIOUS: $(SRC)/%.css +.PRECIOUS: $(SRC)/%.dat +.PRECIOUS: $(SRC)/%.png +.PRECIOUS: $(SRC)/%.jpg +.PRECIOUS: $(SRC)/%.jpeg Index: branches/eam_branches/ipp-20120905/dvodist/configure =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/configure (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/configure (revision 34543) @@ -0,0 +1,3 @@ +#!/bin/sh + +./configure.tcsh $* Index: branches/eam_branches/ipp-20120905/dvodist/configure.tcsh =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/configure.tcsh (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/configure.tcsh (revision 34543) @@ -0,0 +1,237 @@ +#!/bin/csh -f + +# this is a very low-tech version of configure, not built by autoconf. + +# user needs to supply: +# --htdocs : top-level of www files +# --dbhost : machine running database +# --dbuser : username for database access +# --dbpass : password for database access + +set htdocs = "" +set dbhost = "" +set dbuser = "" +set dbpass = "" + +set prefix = "" +set bindir = "" +set libdir = "" +set datadir = "" +set site = "" + +set DBI = "DB" + +set root = "" +set args = "" + +while ("$1" != "") + switch ("$1") + # options passed by jhbuild or others which we ignore + case --enable-maintainer-mode + case --no-create + case --no-recursion + case --sbindir* + case --libexecdir* + case --sharedstatedir* + case --localstatedir* + case --oldincludedir* + case --infodir* + case --mandir* + case --includedir* + case --sysconfdir* + # we need to strip the --opt word and --opt=word versions + set word = `echo $1 | tr = ' '` + if ($#word == 1) shift + breaksw; + case --htdocs* + if ("$1" == "--htdocs") then + shift + set htdocs = $1 + else + set htdocs = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --dbhost* + if ("$1" == "--dbhost") then + shift + set dbhost = $1 + else + set dbhost = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --dbuser* + if ("$1" == "--dbuser") then + shift + set dbuser = $1 + else + set dbuser = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --dbpass* + if ("$1" == "--dbpass") then + shift + set dbpass = $1 + else + set dbpass = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --prefix* + if ("$1" == "--prefix") then + shift + set prefix = $1 + else + set prefix = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --bindir* + if ("$1" == "--bindir") then + shift + set bindir = $1 + else + set bindir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --libdir* + if ("$1" == "--libdir") then + shift + set libdir = $1 + else + set libdir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --datadir* + if ("$1" == "--datadir") then + shift + set datadir = $1 + else + set datadir = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --site* + if ("$1" == "--site") then + shift + set site = $1 + else + set site = `echo $1 | tr = ' ' | awk '{print $2}'` + endif + breaksw; + case --useMDB2 + set DBI = "MDB2" + breaksw; + case --help: + goto usage + case -*: + echo "" + echo "Unknown option: $1" + goto usage + default: + set args=($args $1); + breaksw; + endsw + shift +end + +if ($#args != 1) goto usage + +set hostname = `hostname -f` + +echo +echo "prefix: $prefix" +echo "bindir: $bindir" +echo "libdir: $libdir" +echo "datadir:$datadir" +echo "site: $site" +echo "htdocs: $htdocs" +echo "dbhost: $dbhost" +echo "dbuser: $dbuser" +echo "dbpass: $dbpass" +echo "DBI: $DBI" +echo + +if ("$htdocs" == "") goto usage + +# unless we need a db interface, skip this +# if ("$dbhost" == "") goto usage +# if ("$dbuser" == "") goto usage +# if ("$dbpass" == "") goto usage + +# BINDIR holds the output binary files +if ("$bindir" == "") then + if ("$prefix" == "") goto usage + set bindir = $prefix/bin +endif + +# LIBDIR set the install lib directory +if ("$libdir" == "") then + if ("$prefix" == "") goto usage + set libdir = $prefix/lib +endif + +# DATADIR holds the general non-binary files +if ("$datadir" == "") then + if ("$prefix" == "") goto usage + set datadir = $prefix/share +endif + +# SITE defines the location of the ipprc.config file +if ("$site" == "") then + if ("$datadir" == "") goto usage + set site = $datadir/ippconfig/ipprc.config +endif + +rm -f tmp.1 tmp.2 + +# convert Makefile.in to Makefile: +if (-e Makefile) mv -f Makefile Makefile~ +cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1 +cat tmp.1 | sed "s|@BINDIR@|$bindir|" > Makefile +rm -f tmp.1 + +## # convert raw/site.php.in to raw/site.php +## if (-e raw/site.php) mv -f raw/site.php raw/site.php~ +## cat raw/site.php.in | sed "s|@DBHOST@|$dbhost|" > tmp.1 +## cat tmp.1 | sed "s|@DBUSER@|$dbuser|" > tmp.2 +## cat tmp.2 | sed "s|@DBPASS@|$dbpass|" > tmp.1 +## cat tmp.1 | sed "s|@BINDIR@|$bindir|" > tmp.2 +## cat tmp.2 | sed "s|@LIBDIR@|$libdir|" > tmp.1 +## cat tmp.1 | sed "s|@PERLLIB@|$libdir|" > tmp.2 +## cat tmp.2 | sed "s|@SITE@|$site|" > tmp.1 +## cat tmp.1 | sed "s|@DBI@|$DBI|" > tmp.2 +## cat tmp.2 | sed "s|@HOST@|$hostname|" > raw/site.php +## rm -f tmp.1 tmp.2 + +# need to set the PERLLIB and BINDIR variables (use prefix, bindir, libdir) + +exit 0 + +usage: +if ($#args > 1) then + echo unrecognized options: $args +endif + +cat < + +# DVO Distribution Help + +These web pages contain the PS1 DVO databases, making it easy to +download entire databases with the 'wget' command. It is necessary to +include an authorized user and the password. + +Use a wget command on the directory of interest, eg: + + wget --user=ps1sc --password=(PASS) -r -np -nH http://dvodist.ipp.ifa.hawaii.edu/3pi.20120509 + +Ask your DRAVG representative if you need the password. + +### Header 3 + +> This is a blockquote Lorem ipsum dolor sit amet, + consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. + Vestibulum enim wisi, viverra nec, fringilla in, laoreet + +> more blockquote + +# Download + +* files + * indent list + * more indent + - indent 3 + - indent 4 + * indent 5 + code block +* more indent 2 +* three indent +* other things + +* This is a blockquote Lorem ipsum dolor sit amet, + consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. + Vestibulum enim wisi, viverra nec, fringilla in, laoreet + + This is a blockquote Lorem ipsum dolor sit amet, + consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. + Vestibulum enim wisi, viverra nec, fringilla in, laoreet + +* more blockquote + + + +[Markdown 1.0.1][dl] (18 KB) -- 17 Dec 2004 + +[dl]: http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip + + +Introduction +------------ + +Markdown is a text-to-HTML conversion tool for web writers. Markdown +allows you to write using an easy-to-read, easy-to-write plain text +format, then convert it to structurally valid XHTML (or HTML). + +Thus, "Markdown" is two things: (1) a plain text formatting syntax; +and (2) a software tool, written in Perl, that converts the plain text +formatting to HTML. See the [Syntax][] page for details pertaining to +Markdown's formatting syntax. You can try it out, right now, using the +online [Dingus][]. + + [syntax]: /projects/markdown/syntax + [dingus]: /projects/markdown/dingus + +The overriding design goal for Markdown's formatting syntax is to make +it as readable as possible. The idea is that a Markdown-formatted +document should be publishable as-is, as plain text, without looking +like it's been marked up with tags or formatting instructions. While +Markdown's syntax has been influenced by several existing text-to-HTML +filters, the single biggest source of inspiration for Markdown's +syntax is the format of plain text email. + +The best way to get a feel for Markdown's formatting syntax is simply +to look at a Markdown-formatted document. For example, you can view +the Markdown source for the article text on this page here: + + +(You can use this '.text' suffix trick to view the Markdown source for +the content of each of the pages in this section, e.g. the +[Syntax][s_src] and [License][l_src] pages.) + + [s_src]: /projects/markdown/syntax.text + [l_src]: /projects/markdown/license.text + +Markdown is free software, available under a BSD-style open source +license. See the [License] [pl] page for more information. + + [pl]: /projects/markdown/license + + +Discussion List +--------------- + +I've set up a public [mailing list for discussion about Markdown] [ml]. +Any topic related to Markdown -- both its formatting syntax and +its software -- is fair game for discussion. Anyone who is interested +is welcome to join. + +It's my hope that the mailing list will lead to good ideas for future +improvements to Markdown. + + [ml]: http://six.pairlist.net/mailman/listinfo/markdown-discuss + Index: branches/eam_branches/ipp-20120905/dvodist/www-root/help.txt =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/www-root/help.txt (revision 34407) +++ branches/eam_branches/ipp-20120905/dvodist/www-root/help.txt (revision 34543) @@ -1,2 +1,4 @@ + +

DVO Distribution Help

@@ -4,5 +6,4 @@ download entire databases with the 'wget' command. It is necessary to include an authorized user and the password.

- Use a wget command on the directory of interest, eg: @@ -12,2 +13,45 @@ Ask your DRAVG representative if you need the password. +### Header 3 +> This is a blockquote +> more blockquote + +The overriding design goal for Markdown's formatting syntax is to make +it as readable as possible. The idea is that a Markdown-formatted +document should be publishable as-is, as plain text, without looking +like it's been marked up with tags or formatting instructions. While +Markdown's syntax has been influenced by several existing text-to-HTML +filters, the single biggest source of inspiration for Markdown's +syntax is the format of plain text email. + +The best way to get a feel for Markdown's formatting syntax is simply +to look at a Markdown-formatted document. For example, you can view +the Markdown source for the article text on this page here: + + +(You can use this '.text' suffix trick to view the Markdown source for +the content of each of the pages in this section, e.g. the +[Syntax][s_src] and [License][l_src] pages.) + + [s_src]: /projects/markdown/syntax.text + [l_src]: /projects/markdown/license.text + +Markdown is free software, available under a BSD-style open source +license. See the [License] [pl] page for more information. + + [pl]: /projects/markdown/license + + +Discussion List +--------------- + +I've set up a public [mailing list for discussion about Markdown] [ml]. +Any topic related to Markdown -- both its formatting syntax and +its software -- is fair game for discussion. Anyone who is interested +is welcome to join. + +It's my hope that the mailing list will lead to good ideas for future +improvements to Markdown. + + [ml]: http://six.pairlist.net/mailman/listinfo/markdown-discuss + Index: branches/eam_branches/ipp-20120905/dvodist/www-root/index.php =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/www-root/index.php (revision 34407) +++ branches/eam_branches/ipp-20120905/dvodist/www-root/index.php (revision 34543) @@ -4,4 +4,5 @@ include "$utils/ipp.php"; +include_once "$utils/markdown.php"; // if we come in directly, the top-level directory should be /dvodist @@ -30,5 +31,6 @@ if ($script == "help.php") { - verbatim ("help.txt"); + do_markdown ("help.txt"); + // verbatim ("help.txt"); } Index: branches/eam_branches/ipp-20120905/dvodist/www-root/test.php =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/www-root/test.php (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/www-root/test.php (revision 34543) @@ -0,0 +1,4 @@ + + +non-php, non-html line + Index: branches/eam_branches/ipp-20120905/dvodist/www-root/test2.php =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/www-root/test2.php (revision 34543) +++ branches/eam_branches/ipp-20120905/dvodist/www-root/test2.php (revision 34543) @@ -0,0 +1,54 @@ + script: $script
\n"; + +do_markdown ($script); +echo " done script
\n"; + +menu_end(); +?> + +// generic proxy detection +// if ( $_SERVER['HTTP_X_FORWARDED_FOR'] +// || $_SERVER['HTTP_X_FORWARDED'] +// || $_SERVER['HTTP_FORWARDED_FOR'] +// || $_SERVER['HTTP_CLIENT_IP'] +// || $_SERVER['HTTP_VIA'] +// || in_array($_SERVER['REMOTE_PORT'], array(8080,80,6588,8000,3128,553,554)) +// || @fsockopen($_SERVER['REMOTE_ADDR'], 80, $errno, $errstr, 30)) +// { +// exit('Proxy detected'); +// } + +// list server info: +// $varlist = array ('SCRIPT_NAME', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_VIA', 'REMOTE_ADDR'); +// +// foreach ($varlist as $name) { +// echo "$name : $_SERVER[$name]
\n"; +// } +// +// echo "get list
\n"; +// foreach ($_GET as $key => $value) { +// echo "$key : $value
\n"; +// } + Index: branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php =================================================================== --- branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php (revision 34407) +++ branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php (revision 34543) @@ -165,4 +165,5 @@ // loop over the lines in the file and generate lines in the menu while ($line = fgets ($file, 1024)) { + echo "line: $line
\n"; if (strlen($line) < 2) { if (!$addbreak) { @@ -177,4 +178,17 @@ } fclose ($file); +} + +function do_markdown ($source) { + $file = fopen ($source, "r"); + + // loop over the lines in the file and generate lines in the menu + $ascii = ""; + while ($line = fgets ($file, 1024)) { + $ascii .= $line; + } + fclose ($file); + $my_html = Markdown($ascii); + echo "$my_html"; }