Merge pull request #27 from amereghe/fixOverridingPlatform

Fix overriding platform
Added also note on naming convention of workspace and study, avoiding not only "__" strings but also the name of the platform in lower cases

utilities/bash/dot_profile

@@ -1126,13 +1126,19 @@ sixdeskSetExes(){
 }
 sixdeskSetPlatForm(){
     local __platform=$1
+    local __lerr=0
+    local __origPlatForm=${sixdeskplatform}
     if [ -n "${__platform}" ] ; then
 	# platform as requested by user (no matter if in sixdeskenv or via terminal line option)
 	export sixdeskplatform=`echo "$__platform" | tr '[A-Z]' '[a-z]'`
 	if [ "$sixdeskplatform" != "boinc" ] && [ "$sixdeskplatform" != "lsf" ] && [ "$sixdeskplatform" != "htcondor" ] ; then
 	    sixdeskmess -1 "unknown platform: ${sixdeskplatform}"
-	    return 1
-	fi
+	    let __lerr+=1
+        fi
+        if [ -n "${__origPlatForm}" ] ; then
+            [ -z "${sixdeskjobs}" ] || export sixdeskjobs=${sixdeskjobs/${__origPlatForm}/${sixdeskplatform}}
+            [ -z "${sixdeskjobs_logs}" ] || export sixdeskjobs_logs=${sixdeskjobs_logs/${__origPlatForm}/${sixdeskplatform}}
+        fi
     else
 	# set default platform
 	export sixdeskplatform="htcondor"
@@ -1151,7 +1157,7 @@ sixdeskSetPlatForm(){
 	    [ -n "${sixdeskbnlout}" ] || export sixdeskbnlout=$bnlfilenames
 	fi
     fi
-    return 0
+    return ${__lerr}
 }
 
 sixDeskCheckAppName(){

utilities/doc/chGuidelines.tex

@@ -1,5 +1,15 @@
 \chapter{Giudelines and Common Pitfalls} \label{Guidelines}
 
+\section{Naming Convention}
+\subsection{Study and Workspace Names}
+\begin{itemize}
+\item avoid the use of ``\texttt{\_\_}'' (i.e.~a string of two
+  consecutive underscore characters), as this is used by the BOINC
+  assimilator to properly disentangle study name and name of job in
+  the study;
+\item avoid the use of the platform in lower case explicitly in the name;
+\end{itemize}
+
 \section{Choice of Platform}
 HTCondor is convenient when:
 \begin{enumerate}