Changeset 152 for trunk/SRC/Utilities

Timestamp:

08/10/06 09:01:35 (18 years ago)

Author:

smasson

Message:

introduce pltv.pro

File:

• trunk/SRC/Utilities/find.pro (modified) (8 diffs)

trunk/SRC/Utilities/find.pro

@@ -24 +24 @@
 ; activate this keyword to stop looking for the file as soon as we found one.
 ;
-; @keyword IODIRECTORY {default=!path} 
+; @keyword IODIRECTORY {default=['.',!path]} 
 ; A scalar or array variable of string type, containing
 ; directories names where we are looking for the file.
@@ -34 +34 @@
 ;
 ; @keyword LOOKALLDIR 
-; activate to look for the file with a recursive search
-; in iodir, homedir, !path + the DATA:TestsData directory if it exists.
+; activate to look for the file (with a recursive search if needed)
+; in . iodir, homedir, !path + the DATA:TestsData directory if it exists.
 ;
 ; @keyword NOPRO 
@@ -56 +56 @@
 ; @keyword UNIQUE 
 ; activate to make sure that each element of the output vector is unique.
+;
+; @keyword TRYFIND 
+; if the file was not found and this keyword is activated, find will call
+; itself with the keywords /LOOKALLDIR and /FIRSTFOUND to try to find
+; the file we are looking for. Note that if the file was found at the
+; first try this keyword as no effect (which is not the case with LOOKALLDIR) 
 ;
 ; @keyword _EXTRA 
@@ -106 +112 @@
                , REPERTOIRE = repertoire, NOPRO = nopro, ONLYPRO = onlypro $
                , ONLYNC = onlync, UNIQUE = unique, FIRSTFOUND = firstfound $
-               , LOOKALLDIR = LOOKALLDIR, _extra = ex
+               , LOOKALLDIR = LOOKALLDIR, TRYFIND = tryfind, _extra = ex
 ; define where we look for the file
 ;
@@ -114 +120 @@
     keyword_set(lookalldir):BEGIN
 @cm_general
-      dirnames = [iodir, homedir, !path]
+      dirnames = ['./', iodir, homedir, !path]
       tstdtadir= file_dirname(find('find', /onlypro), /mark_directory)
       tstdtadir = (file_search(tstdtadir+'../../DATA/TestsData'))[0]
@@ -121 +127 @@
     keyword_set(iodirectory): dirnames = iodirectory
     keyword_set(repertoire): dirnames = repertoire
-    ELSE: dirnames = !path
+    ELSE: dirnames = ['./', !path]
   ENDCASE
   tmp = dirnames
@@ -164 +170 @@
     ENDIF
   ENDFOR
+
   IF n_elements(fileout) EQ 1 THEN fileout = 'NOT FOUND' $
   ELSE fileout = fileout[1:*]
@@ -171 +178 @@
   ENDIF ELSE fileout = fileout[0]
 ;
+  IF keyword_set(lookalldir) AND fileout[0] EQ 'NOT FOUND' $
+     AND NOT keyword_set(recursive) THEN $
+        filout = find(file_basename(filein[0]), /lookalldir $
+                      , /recursive, _extra = ex)
+;
+  IF keyword_set(tryfind) AND fileout[0] EQ 'NOT FOUND' THEN BEGIN
+    fileout = find(file_basename(filein[0]), /lookalldir, /firstfound, _extra = ex)
+    fileout = fileout[0]
+  ENDIF
+;
   RETURN, fileout
 END