v. 0.7

Author: Andreas Buerki

README.md

@@ -30,16 +30,16 @@ tested under OS X, Xubuntu Linux, and via Cygwin on Windows 7 and 8 and should w
 *******
 COMPATIBLE SYSTEMS
 
-The WADP was tested on OS X (v. 10.8 10.9 and 10.10), Xubuntu (v. 14.04) and Cygwin (v. 1.8) under Windows 7 and 8. It should run on all platforms on which a bash shell is installed, which includes Windows with the [Cygwin](cygwin.com) package installed.[^1]
+The WADP was tested on OS X (v. 10.12), Xubuntu (v. 14.04), Ubuntu (v. 16.04) and Cygwin under Windows 10. It should run on all platforms on which a bash shell is installed, which includes Windows with the [Cygwin](cygwin.com) package installed.[^1]
 [^1]: The supplied WADP-installer and double-clickable launcher assume that Cygwin is installed in `C:\cygwin` which is the default location. For more information regarding Cygwin requirements, see the WADP manual.
 
 *******
 INSTALLATION
 
 Using the supplied installers:
 
-For OS X, Xubuntu and Cygwin, installers are provided. Inside the WADP directory, double-click on `Xubuntu_installer` (for Xubuntu), `OSX_installer` (OS X) or `Cygwin_installer`/`Cygwin64_installer` (for Cygwin regular and 64-bit installations).[^3]
-[^3]: If the double-clickable installers fail to run, open a terminal window and run the `install.sh` instead.
+For OS X, Ubuntu, Xubuntu and Cygwin, installers are provided. Move the WADP folder onto the Desktop of your computer. Inside the WADP directory, double-click on `Ubuntu_Installer` (for Ubuntu), `Xubuntu_installer` (for Xubuntu), `OSX_installer` (OS X) or `Cygwin_installer`/`Cygwin64_installer` (for Cygwin regular and 64-bit installations).[^3]
+[^3]: If the double-clickable installers fail to run (or when installing on other Linux/UNIX systems), open a terminal window and run the `install.sh` (inside the `src` folder) instead.
 These installers replace previous versions of the installed files. It may be necessary to log out and log in again before the installation takes effect. It should now be possible to launch the WADP by double-clicking on the yellow WADP icon placed on the desktop in in the WADP directory. For further details, see the included manual.
 
 *******

README.pdf

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Installer Ubuntu
+Exec=src/installer.sh
+Terminal=true
+StartupNotify=false

Ubuntu_Installer.desktop

@@ -1,3 +1,15 @@
+release notes v. 0.7
+********************
+
+reporter module
+- made adjustments to run better under Cygwin
+
+installer.sh
+- made adjustments to run better under Linux
+
+added Ubuntu installer launcher and tested under Ubuntu 16.04
+
+
 release notes v. 0.6.9
 **********************
 

release_notes.txt

@@ -5,7 +5,7 @@ export PATH="$PATH:/usr/local/bin:/usr/bin:/bin:"$HOME/bin"" # needed for Cygwin
 copyright="(c) 2015 Cardiff University; written by Andreas Buerki
 Licensed under the EUPL v. 1.1"
 ####
-version="0.6.9"
+version="0.7"
 # DESCRRIPTION: processes word-association data
 ################# defining functions ###############################
 #

src/WADP.sh

@@ -4,13 +4,13 @@
 copyright=" (c)2015-17 Cardiff University; written by Andreas Buerki
 Licensed under the EUPL v. 1.1"
 ####
-version="0.6.9"
+version="0.7"
 # DESCRRIPTION: performs administrative functions on wa dbs and data files
 ################# defining functions ###############################
 # define csv_parser function
 ############################
 csv_parser ( ) {
-sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' $1
+sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' "$1"
 }
 # define add_windows_returns function
 #######################
@@ -127,7 +127,7 @@ echo
 echo "	cue: $cue"
 new_cue=$cue
 echo
-new_diff="$(sed $extended -e 's/</*response missing*/' -e 's/>/*response missing*/' -e 's/		//g' -e 's/\|/ -> /' -e 's/\|/ vs. /' -e 's/\|/ -> /' -e 's/^/	/' <<< "$difference" | sed -e 's/QQUUEESSTTIIOONNMMAARRKK/?/g' -e 's/CCIIRRCCUUMMFFLLEEXX/^/g' -e 's/HHAASSHHTTAAGG/#/g' -e 's/EEXXCCLLAAMM/!/g')"
+new_diff="$(sed $extended -e 's/</-/' -e 's/>/-/' -e 's/		//g' -e 's/\|/ -> /' -e 's/\|/ vs. /' -e 's/\|/ -> /' -e 's/^/	/' <<< "$difference" | sed -e 's/QQUUEESSTTIIOONNMMAARRKK/?/g' -e 's/CCIIRRCCUUMMFFLLEEXX/^/g' -e 's/HHAASSHHTTAAGG/#/g' -e 's/EEXXCCLLAAMM/!/g')"
 echo "$new_diff"
 echo
 # following menu items are conditional so no empty side can be chosen
@@ -543,10 +543,10 @@ if [ "$dat_infile1_name" ]; then
 			echo "" | tee -a $SCRATCHDIR/$log_name
 			echo "$WARN The following responses to cue \"$cue\" differ:"|sed 's/^ //g' | tee -a $SCRATCHDIR/$log_name
 			echo
-			echo "$dat_infile1_name			vs.		  $dat_infile2_name" | tee -a $SCRATCHDIR/$log_name
+			echo "$dat_infile1_name			 vs.		        $dat_infile2_name" | tee -a $SCRATCHDIR/$log_name
 			sort <<< "$resp1" | sed '/^$/d' > $SCRATCHDIR/resp1
 			sort <<< "$resp2" | sed '/^$/d' > $SCRATCHDIR/resp2
-			diff -y --suppress-common-lines $SCRATCHDIR/resp[12] | sed $extended -e 's/</*reponse missing*/g' -e 's/	+ *>/*response missing*					/'|sed -e 's/QQUUEESSTTIIOONNMMAARRKK/?/g' -e 's/CCIIRRCCUUMMFFLLEEXX/^/g' -e 's/HHAASSHHTTAAGG/#/g' -e 's/EEXXCCLLAAMM/!/g' -e 's/|//g'| tee -a $SCRATCHDIR/$log_name
+			diff -y --suppress-common-lines $SCRATCHDIR/resp[12] | sed $extended -e 's/</-/g' -e 's/	+ *>/-						/'|sed -e 's/QQUUEESSTTIIOONNMMAARRKK/?/g' -e 's/CCIIRRCCUUMMFFLLEEXX/^/g' -e 's/HHAASSHHTTAAGG/#/g' -e 's/EEXXCCLLAAMM/!/g' -e 's/|//g'| tee -a $SCRATCHDIR/$log_name
 			# copy over responses only found in dat_infile1
 			for single_resp in $(comm -23 $SCRATCHDIR/resp[12]); do
 				# copy it over and remove it

src/administrator.sh

@@ -3,7 +3,7 @@
 copyright="categoriser.sh (c) 2015-17 Cardiff University; written by Andreas Buerki
 - Licensed under the EUPL v. 1.1"
 ####
-version="0.6.9"
+version="0.7"
 # DESCRRIPTION: assigns categories to word-association data
 ################ the following section can be adjusted
 # the key used for category assignments
@@ -34,7 +34,7 @@ allowed_categories='A,CR,CRRC,E,F,I,L,LCR,LRC,OC,OCCR,OCRC,RC,S,SCR,SRC,SS'
 # define csv_parser function
 ############################
 csv_parser ( ) {
-sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' $1
+sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' "$1"
 }
 #######################
 # define add_windows_returns function

src/categoriser.sh

@@ -3,7 +3,7 @@ export PATH="$PATH:/usr/local/bin:/usr/bin:/bin" # needed for Cygwin
 ##############################################################################
 # installer (c) 2015 Cardiff University, licensed under the EUPL V.1.1.
 # written by Andreas Buerki
-version="0.5"
+version="0.6"
 ####
 ## set installation variables
 export title="WADP"
@@ -31,14 +31,14 @@ Options:   -u	uninstalls the software
 while getopts dhpuV opt
 do
 	case $opt	in
-	d)	diagnostic=true
+	d)	diagnostic=TRUE
 		;;
 	h)	help
 		exit 0
 		;;
-	u)	uninstall=true
+	u)	uninstall=TRUE
 		;;
-	p)	pathonly=true
+	p)	pathonly=TRUE
 		;;
 	V)	echo "$(basename $(sed 's/ //g' <<<$0))	-	version $version"
 		echo "Copyright (c) 2015 Cardiff University"
@@ -61,23 +61,27 @@ fi
 platform=$(uname -s)
 # and make adjustments accordingly
 if [ "$(grep 'CYGWIN' <<< $platform)" ]; then
-	CYGWIN=true
+	CYGWIN=TRUE
 	bash -lc 'export USERNAME="$USERNAME"'
 	# check if $HOME contains spaces
 	if [ "$(grep ' ' <<<"$HOME")" ]; then
 		echo "WARNING: Your Cygwin installation user name contains one or more spaces." >&2
 	fi
 elif [ "$(grep 'Darwin' <<< $platform)" ];then
-	DARWIN=true
+	DARWIN=TRUE
+elif [ "$(grep 'Linux' <<< $platform)" ]; then
+	LINUX=TRUE
 else
-	LINUX=true
+	# probably some flavour of Linux
+	LINUX=TRUE
 fi
 # ascertain source directory
 export sourcedir="$(dirname "$0")"
-if [ "$(grep '^\.' <<<"$sourcedir")" ]; then
+if [ "$(grep '^\.' <<<"$sourcedir")" ] || [ "$LINUX" ]; then
 	sourcedir="$(pwd)/src"
 fi
 if [ "$diagnostic" ]; then 
+	echo "platform is $platform"
 	echo "sourcedir is $sourcedir"
 	echo "0 is $0"
 	echo "dirname is $(dirname "$0")"
@@ -179,7 +183,7 @@ echo ""
 echo "Installing files to $HOME/bin"
 mkdir -p "$DESTINATION"
 for file in $components; do
-	cp "$sourcedir/$file" "$DESTINATION/" || problem=true
+	cp "$sourcedir/$file" "$DESTINATION/" || problem=TRUE
 	if [ "$problem" ]; then
 		echo "Installation encountered problems. Manual installation may be required." >&2
 		exit 1

src/install.sh

@@ -4,13 +4,13 @@
 copyright="2015-7 Cardiff Universtiy; written by Andreas Buerki
 - Licensed under the EUPL v. 1.1"
 ####
-version="0.6.9"
+version="0.7"
 # DESCRRIPTION: creates reports for word-association data
 ################# defining functions ###############################
 # define csv_parser function
 ############################
 csv_parser ( ) {
-sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' $1
+sed $extended -e 's/\|/PIPE/g' -e 's/\"\"//g' -e 's/(([^\",]+)|(\"[^\"]+\")|(\"\")|(\"[^\"]+\"\"[^"]+\"\"[^\"]+\")+)/\1\|/g' -e 's/\|$//g' -e 's/\|,/\|/g' -e 's/,,/\|\|/g' -e 's/\|,/\|\|/g' -e 's/^,/\|/g' -e 's/\"//g' "$1"
 }
 #######################
 # define add_windows_returns function
@@ -375,6 +375,9 @@ if [ -n "$(cut -d '|' -f 1 <<< "$in_header" | grep 'ID')" ]; then
 	in_with_ID=true
 	# put IDs in variable
 	in_respondentIDs=$(cut -d '|' -f 1 <<< "$in_wa")
+	if [ "$CYGWIN" ]; then
+		in_respondentIDs="$(echo $in_respondentIDs | tr '\n' ' ')"
+	fi
 	# check if there are non-unique respondent IDs
 	if [ "$(sort <<< "$in_respondentIDs" |uniq| wc -l)" -ne "$(wc -l <<< "$in_respondentIDs")" ]; then
 		echo "ERROR: non-unique respondent IDs in $in_filename_only. Please verify and try again, or use file without respondent IDs."
@@ -437,9 +440,14 @@ fi
 # pick out cues from header
 cues="$(cut -d '|' -f $(sed -e 's/^ //' -e 's/ /,/g' <<< $cue_columns) <<< "$in_header")"
 no_of_cues=$(( $( tr -dc ' ' <<< $cue_columns | wc -c) + 1 ))
+# adjust cue count for Cygwin
+if [ "$CYGWIN" ]; then
+	(( no_of_cues -= 1 ))
+fi
 if [ "$diagnostic" ]; then
 	echo "cue columns: $cue_columns"
 	echo "no of cues: $no_of_cues"
+	sleep 1
 fi
 ########################### assembling by-respondent report ####################
 if [ "$by_respondent" ]; then
@@ -458,7 +466,7 @@ if [ "$by_respondent" ]; then
 	fi
 	done
 	# assemble overall list of categories
-	extant_cats=$(cut -f 1 $RSCRATCHDIR/* | sort | uniq)
+	extant_cats=$(cut -f 1 $RSCRATCHDIR/* | sort | uniq | tr '\n' ' ')
 	if [ "$diagnostic" ]; then echo "categories are $extant_cats";fi
 	echo "."
 	##### assemble report
@@ -500,7 +508,6 @@ $(sed $extended 's/^\|//g' <<< "$out_row")"
 	out_row=
 	out_cat=
 fi
-
 ########################### assembling by-cue report ####################
 if [ "$by_cue" ]; then
 	echo "Gathering figures for report of categories by cue..."
@@ -509,12 +516,13 @@ if [ "$by_cue" ]; then
 		cut -d '|' -f $colu <<< "$in_categories" | sed 's/^$/_/g' | sort | uniq -c | sed $extended -e 's/^ +//' -e 's/([[:digit:]]+) (.+)/\2	\1/g' > $SCRATCHDIR/$(cut -d '|' -f $colu <<< $cues)
 	done
 	# assemble overall list of categories
-	extant_cats=$(cut -f 1 $SCRATCHDIR/* | sort | uniq)
+	extant_cats=$(cut -f 1 $SCRATCHDIR/* | sort | uniq |tr '\n' ' ')
 	#echo "categories are $extant_cats"
 	##### assemble report
 	# assemble header
 	report_out="cues|$(sed 's/ /|/g' <<< $extant_cats| sed 's/_/no response/g')"
 	# assemble rows
+#	cues="$(tr '\n' ' ' <<<$cues)"
 	for row in $(eval echo {1..$no_of_cues}); do
 		current_cue=$(cut -d '|' -f $row <<< $cues)
 		out_row=$current_cue