Changeset 7452 for trunk/MagicSoft

Timestamp:

12/12/05 13:40:01 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/linkmc (modified) (1 diff)
• datacenter/scripts/rmlocks (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/12/12 Daniela Dorner
+
+   * datacenter/scripts/rmlocks:
+     - fixed condition for removing lock-file
+
+   * datacenter/scripts/linkmc:
+     - improved handling of directories
+
+
+
  2005/12/12 Thomas Bretz
 

trunk/MagicSoft/Mars/datacenter/scripts/linkmc

@@ -183 +183 @@
       continue
    fi
+
+   cont=`echo $dir | cut -d/ -f6`
+   if [ "$cont" == "" ]
+   then
+      continue
+   fi
+
    date=`echo $dir | cut -c 22-25,27,28,30,31`
 # workaround due to 5digit runnumber for data with runnumber < 35487

trunk/MagicSoft/Mars/datacenter/scripts/rmlocks

@@ -34 +34 @@
 for file in ${files[@]}
 do 
-   filedate=`date +%H -r $file`
-   now=`date +%H`
-   compdate=`expr $now - 13 + 24`
-#   echo "date: "$filedate
-#   echo "now: " $now
-#   echo "comp: " $compdate
-   filedate2=`expr $filedate + 24`
-   
-   if [ $compdate -gt $filedate2 ] || [ $filedate -gt $now ]
+   filedate=`date +%Y%j%H%M -r $file`
+   #date to compare: now - 12hours
+   compdate=`date +%Y%j%H%M --date="-12hour"`
+
+   if [ $compdate -gt $filedate ]
    then 
       rm -v $file
       echo "date:  "$filedate
-      echo "date2: "$filedate2
-      echo "now:   "$now
       echo "comp:  "$compdate
       date