Fix, though not pretty, for TravelMapping#540

Author: jteresco

ArchiveGraphs/archive_graphs.sh

@@ -9,21 +9,69 @@ set -e
 install=1
 pull=1
 execdir=`pwd`
-tmbase=$HOME/travelmapping
-tmwebbase=/fast/www/tm
 datestr=`date '+%Y-%m-%d'`
-graphdir=$HOME/temp/graphdata
-graphdir=$tmwebbase/graphdata
 # check for required command line args:
 #
 if [ "$#" -ne 2 ]; then
     echo "Usage: $0 archivename description"
     exit 1
 fi
-export HIGHWAY_DATA=$tmbase/HighwayData
+
+# check default locations of TM repositories
+tmbasedir=$HOME
+if [[ -d $HOME/TravelMapping ]]; then
+    tmbasedir=$HOME/TravelMapping
+elif [[ -d $HOME/travelmapping ]]; then
+    tmbasedir=$HOME/travelmapping
+elif [[ -d $HOME/tm ]]; then
+    tmbasedir=$HOME/tm
+fi
+
+# check default locations of TM web server files
+tmwebdir=/fast/www/tm
+if [[ -d /var/www/html ]]; then
+    tmwebdir=/var/www/html
+elif [[ -d /opt/local/www/apache2/html ]]; then
+    tmwebdir=/opt/local/www/apache2/html
+fi
+
+# make sure we have a valid location for tmbasedir and it has the two
+# needed repositories, and that they appear to be valid repositories
+if [[ ! -d $tmbasedir ]]; then
+    echo "TravelMapping repository base directory $tmbasedir not found"
+    exit 1
+else
+    if [[ ! -d $tmbasedir/HighwayData ]]; then
+	echo "TravelMapping/HighwayData repository not found in $tmbasedir"
+	exit 1
+    elif [[ ! -d $tmbasedir/HighwayData/.git ]]; then
+	echo "TravelMapping/HighwayData in $tmbasedir does not appear to be a git repository"
+	exit 1
+    fi
+    if [[ ! -d $tmbasedir/UserData ]]; then
+	echo "TravelMapping/UserData repository not found in $tmbasedir"
+	exit 1
+    elif [[ ! -d $tmbasedir/UserData/.git ]]; then
+	echo "TravelMapping/UserData in $tmbasedir does not appear to be a git repository"
+	exit 1
+    fi	
+fi
+
+if [[ ! -d $tmwebdir ]]; then
+    echo "Web directory $tmwebdir does not exist"
+    exit 1
+fi
+if [[ ! -f $tmwebdir/participate.php ]]; then
+    echo "Web directory $tmwebdir does not appear to contain a TM web instance"
+    exit 1
+fi
+
+graphdir=$tmwebdir/graphdata
+
+export HIGHWAY_DATA=$tmbasedir/HighwayData
 echo "Creating graph archive set with date stamp $datestr"
 echo "Archive name $1, description: $2"
-archivedir=$tmwebbase/grapharchives/$1
+archivedir=$tmwebdir/grapharchives/$1
 if [ -d $archivedir ]; then
     echo "Archive directory $archivedir exists, exiting"
     exit 1
@@ -34,8 +82,8 @@ echo "Copying existing graphs from $graphdir to $archivedir"
 cp $graphdir/*.tmg $archivedir
 
 echo "Gathering repo head info"
-hwydatavers=`(cd $tmbase/HighwayData; git show -s | head -n 1 | cut -f2 -d' ')`
-userdatavers=`(cd $tmbase/UserData; git show -s | head -n 1 | cut -f2 -d' ')`
+hwydatavers=`(cd $tmbasedir/HighwayData; git show -s | head -n 1 | cut -f2 -d' ')`
+userdatavers=`(cd $tmbasedir/UserData; git show -s | head -n 1 | cut -f2 -d' ')`
 dataprocvers=`git show -s | head -n 1 | cut -f2 -d' '`
 echo "Highway Data: $hwydatavers"
 echo "User Data: $userdatavers"

ArchiveGraphs/archivegraphs.c

@@ -215,7 +215,7 @@ int main(int argc, char *argv[]) {
   /* check for required command-line parameters:
 
      argv[1]: name of archive
-     argv[2]: longer description of the archive set
+     argv[2]: longer description of the archive set, must be in double quotes
      argv[3]: SQL-format date string YYYY-MM-DD
      argv[4]: TravelMapping/HighwayData repository version
      argv[5]: TravelMapping/UserData repository version
@@ -229,8 +229,17 @@ int main(int argc, char *argv[]) {
     usage(argv[0]);
   }
 
+  if (argv[2][0] != '"') {
+    fprintf(stderr, "Error: description must be specified in double quotes.\n");
+    usage(argv[0]);
+  }
+
   char *archive_name = argv[1];
   char *description = argv[2];
+  // strip off double quotes from description
+  description++;
+  description[strlen(description)-1] = '\0';
+  
   /* should check here for a proper date format */
   char *datestamp = argv[3];
   char *hwy_vers = argv[4];