Merge remote branch 'origin/master'

Conflicts: toys/timer.html
2011-12-23 16:38:13 -06:00 · 2011-12-23 16:38:13 -06:00 · ab72ee30e6
parent c4f68982a6 d14ada544d
commit ab72ee30e6
2 changed files with 89 additions and 4 deletions
--- a/portal.cgi
+++ b/portal.cgi
@ -0,0 +1,89 @@
+#! /bin/sh
+
+weather () {
+    curl -s 'http://rss.wunderground.com/auto/rss_full/NM/Los_Alamos.xml?units=metric' | \
+        awk -F ' [-:] ' '
+(/Current Conditions/) { 
+  print "<p class=\"weather\"><a href=\"http://m.wund.com/cgi-bin/findweather/getForecast?brand=mobile&query=87544\">" $2 "</a></p>"; 
+} 
+
+(c == 2) {
+  print "<p class=\"weather\">" $0 "</p>"; 
+  exit; 
+} 
+
+(/CDATA/) {
+  c++;
+}'
+
+}
+
+section () {
+    echo "<h2>$1</h2>"
+    echo "<ul>"
+    curl -s "$3" | \
+        awk -F '>' -v RS='<' -v m=${4:-5} '
+(/^item[> ]/) {
+  a++;
+}
+
+(/^title/) {
+  title=$2;
+}
+
+(a && a<m+1 && /^link/) {
+  l=$2;
+  sub(/.*url=/, "", l);
+  print "<li><a href=\"http://news.google.com/gwt/x?u=" l "\">" title "</a></li>";
+}'
+
+    echo "</ul>"
+    echo "<p class=\"more\"><a href=\"$2\">more...</a></p>"
+}
+
+cat <<EOF
+Content-type: text/html
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Houyhnhnm</title>
+    <style type="text/css">
+h1 { 
+  font-size: large; 
+  font-weight: bold;
+  text-align: center;
+}
+h2 {
+  font-size: large;
+  font-weight: normal;
+  font-style: italic;
+}
+.more {
+  text-align: right;
+}
+    </style>
+  </head>
+  <body>
+    <form action="http://m.google.com/"><input name="q" size="12"><input type="submit" value="G"></form>
+EOF
+weather
+section "Top Stories" \
+    'http://news.google.com/m?pz=1&cf=all&ned=us&hl=en' \
+    'http://news.google.com/news?pz=1&cf=all&ned=us&hl=en&gwt=on&output=rss'
+section "World News" \
+    'http://news.google.com/m?pz=1&cf=all&ned=us&hl=en&topic=w' \
+    'http://news.google.com/news?pz=1&cf=all&ned=us&hl=en&topic=w&output=rss'
+section "CSM" \
+    'http://www.csmonitor.com/textedition' \
+    'http://rss.csmonitor.com/feeds/csm'
+section NPR \
+    'http://thin.npr.org/t.php?tid=1001' \
+    'http://www.npr.org/rss/rss.php?id=1001'
+section "Ars Technica" \
+    'http://m.arstechnica.com/' \
+    'http://feeds.arstechnica.com/arstechnica/index?format=xml'
+cat <<EOF
+  </body>
+</html>
+EOF
--- a/toys/timer.html
+++ b/toys/timer.html
@ -23,10 +23,6 @@
      }
    </style>
    <script type="text/javascript">
-var duration = 12000;
-var beginning;
-var itimer;
-
 function pad(i) {
    if (i < 10) {
        return "0" + i;