[Swift-commit] r6200 - in SwiftApps/modis: . bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-01-30 23:09:59 -0600 (Wed, 30 Jan 2013)
New Revision: 6200

Removed:
   SwiftApps/modis/landuse/
Modified:
   SwiftApps/modis/bin/assemble2.sh
   SwiftApps/modis/bin/colormodis.sh
   SwiftApps/modis/modis.swift
Log:
More changes for compatibility


Modified: SwiftApps/modis/bin/assemble2.sh
===================================================================
--- SwiftApps/modis/bin/assemble2.sh	2013-01-31 04:35:01 UTC (rev 6199)
+++ SwiftApps/modis/bin/assemble2.sh	2013-01-31 05:09:59 UTC (rev 6200)
@@ -5,7 +5,7 @@
 indir=$(cd $(dirname $3); pwd)                             # get full pathname of input dir "geos"
 webdir=$4
 
-tmp=$(mktemp -p . -d modis.assemble.XXXX)
+tmp=$(mktemp -d modis.assemble.XXXX)
 bindir=$(cd $(dirname $0); pwd)
 graytile=$bindir/gray.png
 

Modified: SwiftApps/modis/bin/colormodis.sh
===================================================================
--- SwiftApps/modis/bin/colormodis.sh	2013-01-31 04:35:01 UTC (rev 6199)
+++ SwiftApps/modis/bin/colormodis.sh	2013-01-31 05:09:59 UTC (rev 6200)
@@ -9,17 +9,17 @@
 outfile=$2
 
 # Create temp files in current directory since /tmp may not be available
-tmp=`mktemp -p . modis.$USER.XXXXXX`
+tmp=`mktemp modis.$USER.XXXXXX`
 mv $tmp $tmp.tif
 tmp=$tmp.tif
-map=`mktemp -p . colormap.$USER.XXXXXX`
+map=`mktemp colormap.$USER.XXXXXX`
 
 # Create color set
 
 (
   cat |
   sed -e 's/ c.=/ /g' -e 's/[^0-9 ]//g' |
-  awk '{printf("#%02x%02x%02x #%02x%02x%02x\n",NR-1,NR-1,NR-1,$1,$2,$3)}') >$map <<EOF
+  awk '{printf("#%02x%02x%02x #%02x%02x%02x\n", NR-1, NR-1, NR-1, $1, $2, $3)}') >$map <<EOF
        <Entry c1="32" c2="65" c3="179" c4="255"/>
        <Entry c1="0" c2="106" c3="15" c4="255"/>
        <Entry c1="0" c2="124" c3="37" c4="255"/>

Modified: SwiftApps/modis/modis.swift
===================================================================
--- SwiftApps/modis/modis.swift	2013-01-31 04:35:01 UTC (rev 6199)
+++ SwiftApps/modis/modis.swift	2013-01-31 05:09:59 UTC (rev 6200)
@@ -20,7 +20,7 @@
   colormodis @input @output;
 }
 
-app (imagefile output) assemble
+app (imagefile output, file elog) assemble
     (file selected, imagefile image[], string webdir)
 {
   assemble @output @selected @filename(image[0]) webdir;
@@ -50,7 +50,7 @@
 # Compute the land use summary of each MODIS tile
 
 landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)",
-  transform=@strcat("landuse/\\1.landuse.byfreq")>;
+  transform=@strcat("\\1.landuse.byfreq")>;
 
 foreach g,i in geos {
     land[i] = getLandUse(g,1,MODISdir);
@@ -71,7 +71,7 @@
 
 imagefile colorImage[] <structured_regexp_mapper;
           source=geos, match="(h..v..)", 
-          transform="landuse/\\1.color.png">;
+          transform="\\1.color.png">;
 
 foreach g, i in geos {
   colorImage[i] = colorMODIS(g);