Changeset 796 for trunk/libIGCM

Timestamp:

02/13/13 15:38:37 (11 years ago)

Author:

sdipsl

Message:

Continu to track down SpaceName?=TEST implications at IDRIS

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -467 +467 @@
   fi
   typeset ExistFlag
-  ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" )
+  #Command depends on targeted file system
+  IGCM_sys_IsFileArchived $1
+  if [ $? = 0 ] ; then
+    ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" )
+  else
+    ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 )
+  fi
   IGCM_debug_PopStack "IGCM_sys_TestDirArchive"
-
   return ${ExistFlag}
 }
@@ -498 +503 @@
   IGCM_debug_PushStack "IGCM_sys_TestFileArchive" $@
   typeset ExistFlag
-  ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" )
+  #Command depends on targeted file system
+  IGCM_sys_IsFileArchived $1
+  if [ $? = 0 ] ; then
+    ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" )
+  else
+    ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 )
+  fi
   IGCM_debug_PopStack "IGCM_sys_TestFileArchive"
 
@@ -525 +536 @@
 function IGCM_sys_CountFileArchive {
   IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@
-  IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l"
-  if [ $? -gt 0 ] ; then
+  #Command depends on targeted file system
+  IGCM_sys_IsFileArchived $1
+  if [ $? = 0 ] ; then
+    IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l"
+    status=$?
+  else
+    ls ${@} 2>/dev/null | wc -l
+    status=$?
+  fi
+  if [ ${status} -gt 0 ] ; then
     echo "IGCM_sys_CountFileArchive : erreur."
   fi
@@ -1361 +1380 @@
 
     # test if the (first) file is present in the old computation :
-    IGCM_sys_TestFileArchive ${dm_liste[0]}
-    status=$?
+    IGCM_sys_IsFileArchived ${dm_liste[0]}
+    if [ $? = 0 ] ; then
+      IGCM_sys_TestFileArchive ${dm_liste[0]}
+      status=$?
+    else
+      IGCM_sys_TestFile ${dm_liste[0]}
+      status=$?
+    fi
+
     if [ ${status} -gt 0 ] ; then
       echo "IGCM_sys_Get, ERROR : regular file ${dm_liste[0]} DOES NOT EXIST ."