Changeset 285 for trunk/SRC/Utilities

Timestamp:

09/14/07 13:05:09 (17 years ago)

Author:

smasson

Message:

allways return back a scalar is /firstfound used

Location:

trunk/SRC/Utilities

Files:

• find.pro (modified) (2 diffs)
• protype.pro (modified) (1 diff)
• xfile.pro (modified) (1 diff)
• xhelp.pro (modified) (1 diff)

trunk/SRC/Utilities/find.pro

@@ -20 +20 @@
 ;
 ; @keyword FIRSTFOUND
-; activate this keyword to stop looking for the file as soon as we found one.
+; activate this keyword to stop looking for the file as soon as we
+; found one. Return a scalar string containing the first file found
 ;
 ; @keyword IODIRECTORY {type=scalar string or array of strings} {default=['.',!path]}
@@ -164 +165 @@
     ENDIF ELSE found = file_search(dir + '/' + base, _extra = ex)
     IF found[0] NE '' THEN BEGIN
-      IF keyword_set(firstfound) THEN BEGIN
-        IF keyword_set(unique) THEN return, found[uniq(found, sort(found))] $
-        ELSE return, found
-      ENDIF
+      IF keyword_set(firstfound) THEN return, found[0]
       fileout = [fileout, found]
     ENDIF

trunk/SRC/Utilities/protype.pro

@@ -40 +40 @@
   compile_opt idl2, strictarrsubs
 ;
-  filepro = (find(file[0], /onlypro, /firstfound))[0]
+  filepro = find(file[0], /onlypro, /firstfound)
   if filepro EQ 'NOT FOUND' then return, -1
   name = file_basename(filepro, '.pro')

trunk/SRC/Utilities/xfile.pro

@@ -65 +65 @@
 ;
 ; find the file and display it!
-   pfile = find(filename, /first_found)
+   pfile = find(filename, /firstfound)
    if (pfile NE 'NOT FOUND') then begin
      xdisplayfile, pfile[0], _EXTRA = ex

trunk/SRC/Utilities/xhelp.pro

@@ -68 +68 @@
 ;
 ; find the file and display it!
-   pfile = (find(filename, /first_found))[0]
+   pfile = find(filename, /firstfound)
 ; read it
    IF (pfile NE 'NOT FOUND') THEN BEGIN