Changeset 67 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh

Timestamp:

03/18/09 18:37:16 (15 years ago)

Author:

sdipsl

Message:

libIGCM is ready for ulam except concerning the monitoring

• fix issue due to mfls (chaotic behaviour) do not use mfls anymore
• change due to the fact that ulam do not see gaya : imply some libsys homogeneisation
• atlas/monitoring01 needs an adaptation to ulam (because of "ls $homegaya" like command)

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh (modified) (5 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh

@@ -177 +177 @@
 
 #D-#==================================================
-#D-function IGCM_sys_Nb_files_archive
-#D-* Purpose: Count files on Archive filesystem
-#D-* Examples:
-#D-
-function IGCM_sys_Nb_files_archive {
-   ls ${@} 2>/dev/null | wc -l
-   if [ $? -gt 0 ] ; then
-       echo "IGCM_sys_RshArchive : erreur."
-   fi
-}
-
-#D-#==================================================
 #D-function IGCM_sys_RshPost
 #D-* Purpose: Master rsh command
@@ -353 +341 @@
         echo "IGCM_sys_TestDir :" $@
     fi
-    if [ ! -d ${1} ]; then
-        echo "IGCM_sys_TestDir : Directory $1 does not exist."
-        IGCM_debug_Exit "IGCM_sys_TestDir"
-    fi
+    typeset ExistFlag
+    ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 )
     IGCM_debug_PopStack "IGCM_sys_TestDir"
+
+    return ${ExistFlag}
+#    if [ ! -d ${1} ]; then
+#       echo "IGCM_sys_TestDir : Directory $1 does not exist."
+#       IGCM_debug_Exit "IGCM_sys_TestDir"
+#    fi
 }
 
@@ -370 +362 @@
         echo "IGCM_sys_TestDirArchive :" $@
     fi
-    if [ ! -d ${1} ]; then
-        echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}."
-        IGCM_debug_Exit "IGCM_sys_TestDirArchive"
-    fi
+    typeset ExistFlag
+    ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" )
     IGCM_debug_PopStack "IGCM_sys_TestDirArchive"
+
+    return ${ExistFlag}
+#    if [ ! -d ${1} ]; then
+#       echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}."
+#       IGCM_debug_Exit "IGCM_sys_TestDirArchive"
+#    fi
 }
 
@@ -387 +383 @@
         echo "IGCM_sys_TestFileArchive :" $@
     fi
-    typeset RET 
-
-    mfls ${1} | grep ${1} > /dev/null 2>&1
-    RET=$?
-    if [ ${RET} -gt 0 ]; then
-        IGCM_debug_PopStack "IGCM_sys_TestFileArchive"
-        return 1
-    else
-        IGCM_debug_PopStack "IGCM_sys_TestFileArchive"
-        return 0
-    fi
+    typeset ExistFlag
+    ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" )
+    IGCM_debug_PopStack "IGCM_sys_TestFileArchive"
+
+    return ${ExistFlag}
+}
+
+#D-#==================================================
+#D-function IGCM_sys_CountFileArchive
+#D-* Purpose: Count files on Archive filesystem
+#D-* Examples:
+#D-
+function IGCM_sys_CountFileArchive {
+    IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@
+    IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l"
+    if [ $? -gt 0 ] ; then
+        echo "IGCM_sys_CountFileArchive : erreur."
+    fi
+    IGCM_debug_PopStack "IGCM_sys_CountFileArchive"
 }
 
@@ -911 +915 @@
     fi
     if [ $DRYRUN = 0 ]; then
-        if [ ! -d ${R_SAVE}/${1} ] ; then
+        IGCM_sys_TestDirArchive ${R_SAVE}/${1} 
+        if [ $? != 0 ] ; then
             echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ."
             IGCM_debug_PopStack "IGCM_sys_Put_Dods"