Changeset 1593

Timestamp:

11/25/11 11:31:59 (12 years ago)

Author:

mmaipsl

Message:

Problem with an UTF-8 underscore...

File:

• modipsl/trunk/util/script_diff_model (modified) (3 diffs)

modipsl/trunk/util/script_diff_model

@@ -41 +41 @@
 # env must know MODIPSL path variable !
 MODIPSL=${MODIPSL:=$(pwd)}
+SUBMIT_DIR=$1
 
 DEBUG_mode=false
@@ -177 +178 @@
         case ${ModelSystems[$i]} in
             svn)
-                ListPathRev[$i]=$( svn info ${filecomp} | grep "R.vision *:" | gawk -F  ' ' '{print $2}' )
+                ListPathRev[$i]=$( svn info ${filecomp} | grep "R.vision_*:" | gawk -F  ' ' '{print $2}' )
                 ListPathBranch[$i]=${comp}
                 
@@ -292 +293 @@
 
 done
+
+if [ -d ${SUBMIT_DIR} ] ; then
+    echo "Save SUBMIT_DIR : " ${SUBMIT_DIR}
+    echo
+    pathComp=$( basename ${SUBMIT_DIR} )
+    LocalDirectories[$i]=$( find . -mindepth 1 -type d \
+        \( -not -path "*${MODIPSL_SAVE_NAME}*" -a -name "${pathComp}" \) | head -1 )
+    ModelDirectories[$i]=.
+
+    ListPathComp[$i]=${pathComp}
+
+    cd ${SUBMIT_DIR}
+    SpathComp=${MODIPSL_SAVE}/${LocalDirectories[$i]}
+
+    save_diff_file=${pathComp}
+            
+    ListPathRev[$i]=$( svn info | grep "R.vision_*:" | gawk -F  ' ' '{print $2}' )
+    
+    svn diff > ${MODIPSL}/svn_diff_${save_diff_file}
+    RET=$?
+    if [ $RET -gt 0 ] ; then
+        ListPathComp[$i]="error"
+        ListPathFile[$i]="error"
+        ListPathRev[$i]="error"
+        ListPathBranch[$i]="error"
+    else
+        svn status > ${MODIPSL}/svn_status_${save_diff_file}
+        set -A NewFiles -- $( grep "^? *\(.*\.${SUFFIXES}\|AA_.*\|BB_.*\)$" ${MODIPSL}/svn_status_${save_diff_file} | sed -e "s&? *&&" )
+        printDebugArray NewFiles
+        for file in ${NewFiles[@]} ; do
+            echo "New file : " $file
+            cp -p $file ${SpathComp}/$( dirname $file )
+            ListNewFiles[$NbNewFiles]=${pathComp}/${file}
+            (( NbNewFiles = NbNewFiles + 1 ))
+        done
+
+        set -A ModifiedFiles -- $( grep "^M *" ${MODIPSL}/svn_status_${save_diff_file} | sed -e "s&M *&&" )
+        printDebugArray ModifiedFiles
+        for file in ${ModifiedFiles[@]} ; do
+            echo "Modified file : " $file
+            filedate=$( ls -l --full-time --time-style='+%Y%m%d%H%M%S' $file | gawk -F  ' ' '{print $6}' )
+            Maxfiledate=$(( ( $Maxfiledate > $filedate ) ? $Maxfiledate : $filedate ))
+            ListModifFiles[$NbModifFiles]=${pathComp}/${file}
+            ListModifFilesDate[$NbModifFiles]=${filedate}
+            (( NbModifFiles = NbModifFiles + 1 ))
+        done
+
+        if ( ${DEBUG_mode} ); then 
+            cp ${MODIPSL}/svn_diff_${save_diff_file} ${SpathComp}/svn_diff
+        else
+            rm ${MODIPSL}/svn_status_${save_diff_file}
+            mv ${MODIPSL}/svn_diff_${save_diff_file} ${SpathComp}/svn_diff
+        fi
+        RET=$?
+        if [ $RET -gt 0 ] ; then
+            ListPathComp[$i]="error"
+            ListPathFile[$i]="error"
+            ListPathRev[$i]="error"
+            ListPathBranch[$i]="error"
+        fi
+    fi
+    
+    echo 
+    cd ${MODIPSL}
+fi
+
 printDebugArray ListPathComp
 printDebugArray ListPathFile